ChangeLogTag:Sat Mar 16 01:58:21 2002 Ossama Othman <ossama@uci.edu>

6 files changed, 37377 insertions, 3347 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 86e5c2ccb4e..91caaacaa6d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Sat Mar 16 01:58:21 2002  Ossama Othman  <ossama@uci.edu>
+
+	* tao/IFR_Client/IFR_BaseC.cpp:
+	* tao/IFR_Client/IFR_ComponentsC.cpp:
+
+	  Include "tao/Invocation.h" to pull in TAO_GIOP_Invocation class
+	  declaration.  Necessitated by header reduction in IFR_BaseC.h.
+	  Fixes minimum CORBA builds.
+
+	* tao/IFR_Client/diffs/IFR_BaseC.cpp.diff:
+	* tao/IFR_Client/diffs/IFR_BaseC.h.diff:
+	* tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff:
+
+	  Regenerated these diff files.
+
 Sat Mar 16 01:27:32 2002  Ossama Othman  <ossama@uci.edu>
 
 	* tao/IFR_Client/IFR_BaseC.h:
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 56ce0a4de19..7d8c09e5334 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -22,6 +22,7 @@
 #include "IFR_BaseC.h"
 
 #include "tao/Stub.h"
+#include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index f329a09d59f..3f9e16e51eb 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -22,6 +22,7 @@
 #include "IFR_ComponentsC.h"
 
 #include "tao/Stub.h"
+#include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
index 86515b859f1..06ae6cfd7d2 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseC.cpp	Tue Apr 24 23:25:42 2001
-+++ IFR_BaseC.cpp	Tue Apr 24 22:49:23 2001
+--- orig/IFR_BaseC.cpp	Sat Mar 16 01:41:17 2002
++++ IFR_BaseC.cpp	Fri Mar  8 12:24:01 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,23 +8,121 @@
  
  // ****  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"
+@@ -32,301 +32,44 @@
  #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-@@ -36,154 +35,6 @@
+ 
+ #if defined (__BORLANDC__)
+-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
++#pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+ 
+ #if !defined (__ACE_INLINE__)
  #include "IFR_BaseC.i"
  #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_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
+-
 -static const CORBA::Long _oc_CORBA_DefinitionKind[] =
 -{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
@@ -170,40 +268,902 @@
 -
 -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_DEFINE (::CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_CORBA_DefinitionKind)
 -TAO_NAMESPACE_END
 -
- CORBA_IRObject_ptr
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int CORBA::IRObject::_tao_class_id = 0;
+-
+-CORBA::IRObject_ptr
++CORBA_IRObject_ptr
  tao_CORBA_IRObject_duplicate (
-     CORBA_IRObject_ptr p
-@@ -987,7 +838,7 @@
-     return CORBA_IRObject::_nil ();
+-    CORBA::IRObject_ptr p
++    CORBA_IRObject_ptr p
+   )
+ {
+-  return CORBA::IRObject::_duplicate (p);
++  return CORBA_IRObject::_duplicate (p);
+ }
+ 
+ void
+ tao_CORBA_IRObject_release (
+-    CORBA::IRObject_ptr p
++    CORBA_IRObject_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-CORBA::IRObject_ptr
++CORBA_IRObject_ptr
+ tao_CORBA_IRObject_nil (
+     void
+   )
+ {
+-  return CORBA::IRObject::_nil ();
++  return CORBA_IRObject::_nil ();
+ }
+ 
+-CORBA::IRObject_ptr
++CORBA_IRObject_ptr
+ tao_CORBA_IRObject_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return CORBA::IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+@@ -334,193 +77,191 @@
+     void *src
+   )
+ {
+-  CORBA::IRObject **tmp =
+-    ACE_static_cast (CORBA::IRObject **, src);
++  CORBA_IRObject **tmp =
++    ACE_static_cast (CORBA_IRObject **, src);
+   return *tmp;
+ }
+ 
++int CORBA_IRObject::_tao_class_id = 0;
++
+ // *************************************************************
+-// CORBA::IRObject_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class CORBA_IRObject_var
+ // *************************************************************
+ 
+-CORBA::IRObject_var::IRObject_var (void) // default constructor
+-  : ptr_ (IRObject::_nil ())
++CORBA_IRObject_var::CORBA_IRObject_var (void) // default constructor
++  : ptr_ (CORBA_IRObject::_nil ())
+ {}
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::ptr (void) const
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::ptr (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-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 ()))
+ {}
+ 
+-CORBA::IRObject_var::~IRObject_var (void) // destructor
++CORBA_IRObject_var::~CORBA_IRObject_var (void) // destructor
+ {
+   CORBA::release (this->ptr_);
+ }
+ 
+-CORBA::IRObject_var &
+-CORBA::IRObject_var::operator= (IRObject_ptr p)
++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)
++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;
+ }
+ 
+-CORBA::IRObject_var::operator const ::CORBA::IRObject_ptr &() const // cast
++CORBA_IRObject_var::operator const ::CORBA_IRObject_ptr &() const // cast
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::IRObject_var::operator ::CORBA::IRObject_ptr &() // cast 
++CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::operator-> (void) const
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::operator-> (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::in (void) const
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::in (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr &
+-CORBA::IRObject_var::inout (void)
++::CORBA_IRObject_ptr &
++CORBA_IRObject_var::inout (void)
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr &
+-CORBA::IRObject_var::out (void)
++::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_;
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::_retn (void)
++::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;
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::tao_duplicate (IRObject_ptr p)
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::tao_duplicate (CORBA_IRObject_ptr p)
+ {
+-  return ::CORBA::IRObject::_duplicate (p);
++  return ::CORBA_IRObject::_duplicate (p);
+ }
+ 
+ void
+-CORBA::IRObject_var::tao_release (IRObject_ptr p)
++CORBA_IRObject_var::tao_release (CORBA_IRObject_ptr p)
+ {
+   CORBA::release (p);
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::tao_nil (void)
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::tao_nil (void)
+ {
+-  return ::CORBA::IRObject::_nil ();
++  return ::CORBA_IRObject::_nil ();
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_var::tao_narrow (
++::CORBA_IRObject_ptr
++CORBA_IRObject_var::tao_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return ::CORBA::IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return ::CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+-CORBA::IRObject_var::tao_upcast (void *src)
++CORBA_IRObject_var::tao_upcast (void *src)
+ {
+-  IRObject **tmp =
+-    ACE_static_cast (IRObject **, src);
++  CORBA_IRObject **tmp =
++    ACE_static_cast (CORBA_IRObject **, src);
+   return *tmp;
+ }
+ 
+ // *************************************************************
+-// CORBA::IRObject_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class CORBA_IRObject_out
+ // *************************************************************
+ 
+-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 ();
+ }
+ 
+-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 ();
+ }
+ 
+-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_)
+ {}
+ 
+-::CORBA::IRObject_out &
+-CORBA::IRObject_out::operator= (const ::CORBA::IRObject_out &p)
++::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;
+ }
+ 
+-CORBA::IRObject_out &
+-CORBA::IRObject_out::operator= (const ::CORBA::IRObject_var &p)
++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;
+ }
+ 
+-CORBA::IRObject_out &
+-CORBA::IRObject_out::operator= (IRObject_ptr p)
++CORBA_IRObject_out &
++CORBA_IRObject_out::operator= (CORBA_IRObject_ptr p)
+ {
+   this->ptr_ = p;
+   return *this;
+ }
+ 
+-CORBA::IRObject_out::operator ::CORBA::IRObject_ptr &() // cast
++CORBA_IRObject_out::operator ::CORBA_IRObject_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr &
+-CORBA::IRObject_out::ptr (void) // ptr
++::CORBA_IRObject_ptr &
++CORBA_IRObject_out::ptr (void) // ptr
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IRObject_ptr
+-CORBA::IRObject_out::operator-> (void)
++::CORBA_IRObject_ptr
++CORBA_IRObject_out::operator-> (void)
+ {
+   return this->ptr_;
+ }
+@@ -532,16 +273,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::DefinitionKind result);
+@@ -555,7 +303,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -570,7 +319,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -585,6 +333,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -602,7 +351,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (::CORBA::DefinitionKind result)
++TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::DefinitionKind result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -613,16 +362,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_IRObject_destroy (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ private:
+@@ -634,7 +390,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -649,7 +406,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -664,6 +420,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -683,15 +440,15 @@
+ //                Base & Remote Proxy  Implementation. 
+ //
+ 
+-CORBA::_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
++_TAO_CORBA_IRObject_Proxy_Impl::_TAO_CORBA_IRObject_Proxy_Impl (void)
+ {}
+ 
+-CORBA::_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 CORBA::_TAO_IRObject_Remote_Proxy_Impl::def_kind (
++CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -732,9 +489,10 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -742,14 +500,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -786,9 +544,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -810,12 +568,12 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::DefinitionKind _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          CORBA::DefinitionKind _tao_retval_info = _tao_retval;
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -823,15 +581,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -842,7 +600,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -856,7 +614,7 @@
+ return _tao_retval;
+ }
+ 
+-void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
++void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -897,9 +655,10 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_IRObject_destroy _tao_ri (
++      TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -907,14 +666,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -950,9 +709,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -964,9 +723,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -974,15 +733,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -993,7 +752,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -1017,37 +776,37 @@
+ //           Remote & Base  Proxy Broker Implementation
+ //
+ 
+-CORBA::_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
++_TAO_CORBA_IRObject_Proxy_Broker::_TAO_CORBA_IRObject_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
++_TAO_CORBA_IRObject_Proxy_Broker::~_TAO_CORBA_IRObject_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_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.
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker *
+-CORBA::_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 ::CORBA::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
++  static ::_TAO_CORBA_IRObject_Remote_Proxy_Broker remote_proxy_broker;
+   return &remote_proxy_broker;
+ }
+ 
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
++_TAO_CORBA_IRObject_Remote_Proxy_Broker::_TAO_CORBA_IRObject_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
++_TAO_CORBA_IRObject_Remote_Proxy_Broker::~_TAO_CORBA_IRObject_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IRObject_Proxy_Impl&
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
+-  ::CORBA::IRObject *
++_TAO_CORBA_IRObject_Proxy_Impl&
++_TAO_CORBA_IRObject_Remote_Proxy_Broker::select_proxy (
++  ::CORBA_IRObject *
+   ACE_ENV_ARG_DECL_NOT_USED
+ )
+ {
+@@ -1060,124 +819,108 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
+-CORBA::IRObject::IRObject (int collocated)
++// default constructor
++CORBA_IRObject::CORBA_IRObject (int collocated)
+ {
+   this->CORBA_IRObject_setup_collocation (collocated);
+ }
+ 
+-CORBA::IRObject::~IRObject (void)
++// destructor
++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_ =
+-      ::CORBA::_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 *_tao_void_pointer)
++void CORBA_IRObject::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  IRObject *tmp = ACE_static_cast (IRObject*, _tao_void_pointer);
++  CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*, _tao_void_pointer);
+   CORBA::release (tmp);
+ }
+ 
+-CORBA::IRObject_ptr CORBA::IRObject::_narrow (
++CORBA_IRObject_ptr CORBA_IRObject::_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL
+   )
+ {
+   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);
-+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
+       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" ACE_ENV_ARG_PARAMETER);
+-      ACE_CHECK_RETURN (IRObject::_nil ());
++      ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
        if (is_a == 0)
-         return CORBA_IRObject::_nil ();
-@@ -1055,7 +906,7 @@
- CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-        return IRObject::_nil ();
++        return CORBA_IRObject::_nil ();
+     }
+-  return IRObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
++  return CORBA_IRObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-CORBA::IRObject_ptr 
+-CORBA::IRObject::_unchecked_narrow (
++CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+ {
+   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_CORBA_IRObject_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+               default_proxy,
+-              ::CORBA::IRObject (
++          ::CORBA_IRObject (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              IRObject::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::CORBA::IRObject (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              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 ());
+       return default_proxy;
+     }
+   else 
+     return
+       ACE_reinterpret_cast
+         (
+-          IRObject_ptr,
++            CORBA_IRObject_ptr,
+             obj->_tao_QueryInterface
+               (
+                 ACE_reinterpret_cast
+                   (
+                     ptr_arith_t,
+-                    &IRObject::_tao_class_id
++                      &CORBA_IRObject::_tao_class_id
+                   )
+               )
+         );
+ }
+ 
+-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 ACE_ENV_ARG_DECL)
++CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
  {
    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
-@@ -1080,7 +931,7 @@
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+@@ -1187,12 +930,12 @@
+     return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-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)::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
+     retv = ACE_reinterpret_cast (void *,
+@@ -1203,147 +946,76 @@
+   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";
+ }
  
- const char* CORBA_IRObject::_interface_repository_id (void) const
+-::CORBA::DefinitionKind CORBA::IRObject::def_kind (
+-    
++CORBA::DefinitionKind CORBA_IRObject::def_kind (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
  {
--  return "IDL:omg.org/CORBA_IRObject:1.0";
-+  return "IDL:omg.org/CORBA/IRObject:1.0";
+-  _TAO_IRObject_Proxy_Impl &proxy = 
+-    this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_IRObject_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN ((CORBA::DefinitionKind)0);
+   
+   return proxy.def_kind (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
  }
  
- CORBA::DefinitionKind CORBA_IRObject::def_kind (
-@@ -1117,36 +968,6 @@
+-void CORBA::IRObject::destroy (
+-    
++void CORBA_IRObject::destroy (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_IRObject_Proxy_Impl &proxy = 
+-    this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_IRObject_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+   
+   proxy.destroy (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
@@ -215,15 +1175,14 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f4952), 
+-  ACE_NTOHL (0x412f4952), 
 -  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
+-  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 (
@@ -231,61 +1190,2984 @@
 -    sizeof (_oc_CORBA_IRObject),
 -    (char *) &_oc_CORBA_IRObject,
 -    0,
--    sizeof (CORBA_IRObject)
+-    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_VersionSpec[] =
+-{
+-  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
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_VersionSpec (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_VersionSpec),
+-    (char *) &_oc_CORBA_VersionSpec,
+-    0,
+-    sizeof (CORBA::VersionSpec)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_IRObject =
--  &_tc_TAO_tc_CORBA_IRObject;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_VersionSpec, &_tc_TAO_tc_CORBA_VersionSpec)
+-TAO_NAMESPACE_END
+-
 -
- CORBA_Contained_ptr
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int CORBA::Contained::_tao_class_id = 0;
+-
+-CORBA::Contained_ptr
++CORBA_Contained_ptr
  tao_CORBA_Contained_duplicate (
-     CORBA_Contained_ptr p
-@@ -4247,7 +4068,7 @@
-     return CORBA_Contained::_nil ();
+-    CORBA::Contained_ptr p
++    CORBA_Contained_ptr p
+   )
+ {
+-  return CORBA::Contained::_duplicate (p);
++  return CORBA_Contained::_duplicate (p);
+ }
+ 
+ void
+ tao_CORBA_Contained_release (
+-    CORBA::Contained_ptr p
++    CORBA_Contained_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-CORBA::Contained_ptr
++CORBA_Contained_ptr
+ tao_CORBA_Contained_nil (
+     void
+   )
+ {
+-  return CORBA::Contained::_nil ();
++  return CORBA_Contained::_nil ();
+ }
+ 
+-CORBA::Contained_ptr
++CORBA_Contained_ptr
+ tao_CORBA_Contained_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return CORBA::Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+@@ -1351,193 +1023,191 @@
+     void *src
+   )
+ {
+-  CORBA::Contained **tmp =
+-    ACE_static_cast (CORBA::Contained **, src);
++  CORBA_Contained **tmp =
++    ACE_static_cast (CORBA_Contained **, src);
+   return *tmp;
+ }
+ 
++int CORBA_Contained::_tao_class_id = 0;
++
+ // *************************************************************
+-// CORBA::Contained_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class CORBA_Contained_var
+ // *************************************************************
+ 
+-CORBA::Contained_var::Contained_var (void) // default constructor
+-  : ptr_ (Contained::_nil ())
++CORBA_Contained_var::CORBA_Contained_var (void) // default constructor
++  : ptr_ (CORBA_Contained::_nil ())
+ {}
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::ptr (void) const
++::CORBA_Contained_ptr
++CORBA_Contained_var::ptr (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::Contained_var::Contained_var (const ::CORBA::Contained_var &p) // copy constructor
++CORBA_Contained_var::CORBA_Contained_var (const ::CORBA_Contained_var &p) // copy constructor
+   : TAO_Base_var (),
+-    ptr_ (Contained::_duplicate (p.ptr ()))
++    ptr_ (CORBA_Contained::_duplicate (p.ptr ()))
+ {}
+ 
+-CORBA::Contained_var::~Contained_var (void) // destructor
++CORBA_Contained_var::~CORBA_Contained_var (void) // destructor
+ {
+   CORBA::release (this->ptr_);
+ }
+ 
+-CORBA::Contained_var &
+-CORBA::Contained_var::operator= (Contained_ptr p)
++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)
++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 ());
++    this->ptr_ = ::CORBA_Contained::_duplicate (p.ptr ());
+   }
+   return *this;
+ }
+ 
+-CORBA::Contained_var::operator const ::CORBA::Contained_ptr &() const // cast
++CORBA_Contained_var::operator const ::CORBA_Contained_ptr &() const // cast
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::Contained_var::operator ::CORBA::Contained_ptr &() // cast 
++CORBA_Contained_var::operator ::CORBA_Contained_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::operator-> (void) const
++::CORBA_Contained_ptr
++CORBA_Contained_var::operator-> (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::in (void) const
++::CORBA_Contained_ptr
++CORBA_Contained_var::in (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr &
+-CORBA::Contained_var::inout (void)
++::CORBA_Contained_ptr &
++CORBA_Contained_var::inout (void)
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr &
+-CORBA::Contained_var::out (void)
++::CORBA_Contained_ptr &
++CORBA_Contained_var::out (void)
+ {
+   CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA::Contained::_nil ();
++  this->ptr_ = ::CORBA_Contained::_nil ();
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::_retn (void)
++::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 ();
++  ::CORBA_Contained_ptr val = this->ptr_;
++  this->ptr_ = ::CORBA_Contained::_nil ();
+   return val;
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::tao_duplicate (Contained_ptr p)
++::CORBA_Contained_ptr
++CORBA_Contained_var::tao_duplicate (CORBA_Contained_ptr p)
+ {
+-  return ::CORBA::Contained::_duplicate (p);
++  return ::CORBA_Contained::_duplicate (p);
+ }
+ 
+ void
+-CORBA::Contained_var::tao_release (Contained_ptr p)
++CORBA_Contained_var::tao_release (CORBA_Contained_ptr p)
+ {
+   CORBA::release (p);
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::tao_nil (void)
++::CORBA_Contained_ptr
++CORBA_Contained_var::tao_nil (void)
+ {
+-  return ::CORBA::Contained::_nil ();
++  return ::CORBA_Contained::_nil ();
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_var::tao_narrow (
++::CORBA_Contained_ptr
++CORBA_Contained_var::tao_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return ::CORBA::Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return ::CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+-CORBA::Contained_var::tao_upcast (void *src)
++CORBA_Contained_var::tao_upcast (void *src)
+ {
+-  Contained **tmp =
+-    ACE_static_cast (Contained **, src);
++  CORBA_Contained **tmp =
++    ACE_static_cast (CORBA_Contained **, src);
+   return *tmp;
+ }
+ 
+ // *************************************************************
+-// CORBA::Contained_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class CORBA_Contained_out
+ // *************************************************************
+ 
+-CORBA::Contained_out::Contained_out (Contained_ptr &p)
++CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_ptr &p)
+   : ptr_ (p)
+ {
+-  this->ptr_ = ::CORBA::Contained::_nil ();
++  this->ptr_ = ::CORBA_Contained::_nil ();
+ }
+ 
+-CORBA::Contained_out::Contained_out (Contained_var &p) // constructor from _var
++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 ();
++  this->ptr_ = ::CORBA_Contained::_nil ();
+ }
+ 
+-CORBA::Contained_out::Contained_out (const ::CORBA::Contained_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (Contained_out &, p).ptr_)
++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)
++::CORBA_Contained_out &
++CORBA_Contained_out::operator= (const ::CORBA_Contained_out &p)
+ {
+-  this->ptr_ = ACE_const_cast (Contained_out&, p).ptr_;
++  this->ptr_ = ACE_const_cast (CORBA_Contained_out&, p).ptr_;
+   return *this;
+ }
+ 
+-CORBA::Contained_out &
+-CORBA::Contained_out::operator= (const ::CORBA::Contained_var &p)
++CORBA_Contained_out &
++CORBA_Contained_out::operator= (const ::CORBA_Contained_var &p)
+ {
+-  this->ptr_ = ::CORBA::Contained::_duplicate (p.ptr ());
++  this->ptr_ = ::CORBA_Contained::_duplicate (p.ptr ());
+   return *this;
+ }
+ 
+-CORBA::Contained_out &
+-CORBA::Contained_out::operator= (Contained_ptr p)
++CORBA_Contained_out &
++CORBA_Contained_out::operator= (CORBA_Contained_ptr p)
+ {
+   this->ptr_ = p;
+   return *this;
+ }
+ 
+-CORBA::Contained_out::operator ::CORBA::Contained_ptr &() // cast
++CORBA_Contained_out::operator ::CORBA_Contained_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr &
+-CORBA::Contained_out::ptr (void) // ptr
++::CORBA_Contained_ptr &
++CORBA_Contained_out::ptr (void) // ptr
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Contained_ptr
+-CORBA::Contained_out::operator-> (void)
++::CORBA_Contained_ptr
++CORBA_Contained_out::operator-> (void)
+ {
+   return this->ptr_;
+ }
+@@ -1549,16 +1219,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_id_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (char * result);
+@@ -1572,7 +1249,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -1587,7 +1265,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -1602,6 +1279,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -1631,16 +1309,23 @@
+   TAO_ClientRequestInfo_CORBA_Contained_id_set (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * id
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ private:
+@@ -1654,7 +1339,8 @@
+ TAO_ClientRequestInfo_CORBA_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contained_id_set (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+-    const char * id ACE_ENV_ARG_DECL_NOT_USED    
++    const char * id
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id)
+@@ -1693,6 +1379,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -1711,16 +1398,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_name_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (char * result);
+@@ -1734,7 +1428,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -1749,7 +1444,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -1764,6 +1458,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -1793,16 +1488,23 @@
+   TAO_ClientRequestInfo_CORBA_Contained_name_set (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * name
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ private:
+@@ -1816,7 +1518,8 @@
+ TAO_ClientRequestInfo_CORBA_Contained_name_set::TAO_ClientRequestInfo_CORBA_Contained_name_set (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+-    const char * name ACE_ENV_ARG_DECL_NOT_USED    
++    const char * name
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     name_ (name)
+@@ -1855,6 +1558,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -1873,16 +1577,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_version_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (char * result);
+@@ -1896,7 +1607,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -1911,7 +1623,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -1926,6 +1637,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -1955,16 +1667,23 @@
+   TAO_ClientRequestInfo_CORBA_Contained_version_set (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * version ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * version
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ private:
+@@ -1978,7 +1697,8 @@
+ TAO_ClientRequestInfo_CORBA_Contained_version_set::TAO_ClientRequestInfo_CORBA_Contained_version_set (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+-    const char * version ACE_ENV_ARG_DECL_NOT_USED    
++    const char * version
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     version_ (version)
+@@ -2017,6 +1737,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2035,30 +1756,38 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -2073,7 +1802,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -2088,6 +1816,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2105,7 +1834,7 @@
+ }
+ 
+ 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;
+@@ -2116,16 +1845,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (char * result);
+@@ -2139,7 +1875,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -2154,7 +1891,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -2169,6 +1905,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2197,30 +1934,38 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -2235,7 +1980,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -2250,6 +1994,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2267,7 +2012,7 @@
+ }
+ 
+ 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;
+@@ -2278,30 +2023,38 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_Contained_describe (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -2316,7 +2069,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -2331,6 +2083,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2348,7 +2101,7 @@
+ }
+ 
+ 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;
+@@ -2360,25 +2113,32 @@
+   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 ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * new_version
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ 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_;
+   
+@@ -2387,9 +2147,10 @@
+ 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 ACE_ENV_ARG_DECL_NOT_USED    
++    const char * new_version
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     new_container_ (new_container),
+@@ -2436,6 +2197,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2455,15 +2217,15 @@
+ //                Base & Remote Proxy  Implementation. 
+ //
+ 
+-CORBA::_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
++_TAO_CORBA_Contained_Proxy_Impl::_TAO_CORBA_Contained_Proxy_Impl (void)
+ {}
+ 
+-CORBA::_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 * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
++char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -2472,12 +2234,12 @@
+   ))
+ {
+   
+-  CORBA::String_var _tao_retval;
++  CORBA::String_var _tao_safe_retval;
+   
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -2504,24 +2266,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_id_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_id_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2535,17 +2298,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -2558,9 +2321,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -2571,7 +2334,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -2582,13 +2345,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          char * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          char * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2596,15 +2359,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -2612,11 +2375,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -2626,10 +2389,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
++void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id
+     ACE_ENV_ARG_DECL
+@@ -2671,10 +2434,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_id_set _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_id_set ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        id ACE_ENV_ARG_PARAMETER
++        id
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -2682,14 +2446,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2733,9 +2497,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -2747,9 +2511,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2757,15 +2521,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -2776,7 +2540,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -2790,7 +2554,7 @@
+ 
+ }
+ 
+-char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
++char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -2799,12 +2563,12 @@
+   ))
+ {
+   
+-  CORBA::String_var _tao_retval;
++  CORBA::String_var _tao_safe_retval;
+   
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -2831,24 +2595,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_name_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_name_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2862,17 +2627,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -2885,9 +2650,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -2898,7 +2663,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -2909,13 +2674,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          char * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          char * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2923,15 +2688,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -2939,11 +2704,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -2953,10 +2718,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
++void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
+     CORBA_Object *_collocated_tao_target_,
+     const char * name
+     ACE_ENV_ARG_DECL
+@@ -2998,10 +2763,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_name_set _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_name_set ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        name ACE_ENV_ARG_PARAMETER
++        name
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -3009,14 +2775,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3060,9 +2826,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3074,9 +2840,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3084,15 +2850,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3103,7 +2869,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -3117,7 +2883,7 @@
+ 
+ }
+ 
+-char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
++char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3126,12 +2892,12 @@
+   ))
+ {
+   
+-  CORBA::String_var _tao_retval;
++  CORBA::String_var _tao_safe_retval;
+   
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -3158,24 +2924,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_version_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_version_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3189,17 +2956,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3212,9 +2979,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3225,7 +2992,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3236,13 +3003,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          char * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          char * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3250,15 +3017,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3266,11 +3033,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3280,10 +3047,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
++void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
+     CORBA_Object *_collocated_tao_target_,
+     const char * version
+     ACE_ENV_ARG_DECL
+@@ -3325,10 +3092,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_version_set _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_version_set ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        version ACE_ENV_ARG_PARAMETER
++        version
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -3336,14 +3104,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3387,9 +3155,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3401,9 +3169,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3411,15 +3179,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3430,7 +3198,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -3444,7 +3212,7 @@
+ 
+ }
+ 
+-::CORBA::Container_ptr CORBA::_TAO_Contained_Remote_Proxy_Impl::defined_in (
++CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3453,13 +3221,13 @@
+   ))
+ {
+   
+-  CORBA::Container_var _tao_retval (CORBA::Container::_nil ());
+-
++  CORBA_Container_ptr _tao_retval = CORBA_Container::_nil ();
++  CORBA_Container_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -3486,24 +3254,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_defined_in_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3517,17 +3286,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3540,9 +3309,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3553,7 +3322,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3564,13 +3333,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::Container_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3578,15 +3347,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3594,11 +3363,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3608,10 +3377,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
++char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3620,12 +3389,12 @@
+   ))
+ {
+   
+-  CORBA::String_var _tao_retval;
++  CORBA::String_var _tao_safe_retval;
+   
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -3652,24 +3421,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3683,17 +3453,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3706,9 +3476,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3719,7 +3489,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3730,13 +3500,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          char * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          char * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3744,15 +3514,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3760,11 +3530,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3774,10 +3544,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::Repository_ptr CORBA::_TAO_Contained_Remote_Proxy_Impl::containing_repository (
++CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_repository (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3786,13 +3556,13 @@
+   ))
+ {
+   
+-  CORBA::Repository_var _tao_retval ( tao_CORBA_Repository_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -3819,24 +3589,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3850,17 +3621,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3873,9 +3644,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3886,7 +3657,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3897,13 +3668,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::Repository_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3911,15 +3682,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3927,11 +3698,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3941,10 +3712,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::Contained::Description * CORBA::_TAO_Contained_Remote_Proxy_Impl::describe (
++CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3953,18 +3724,15 @@
+   ))
+ {
+   
+-  CORBA::Contained::Description_var _tao_retval;
++  CORBA_Contained::Description *_tao_retval = 0;
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    CORBA::Contained::Description *tmp;
+-    ACE_NEW_RETURN (tmp, CORBA::Contained::Description, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -3989,24 +3757,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_describe _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_describe ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4020,17 +3789,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -4043,9 +3812,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -4056,7 +3825,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -4067,13 +3836,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::Contained::Description * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4081,15 +3850,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -4097,11 +3866,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -4111,12 +3880,12 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-void CORBA::_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
+     ACE_ENV_ARG_DECL
+@@ -4138,7 +3907,7 @@
+       istub,
+       "move",
+       4,
+-      3,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -4158,12 +3927,13 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Contained_move _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Contained_move ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         new_container,
+         new_name,
+-        new_version ACE_ENV_ARG_PARAMETER
++        new_version
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -4171,14 +3941,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4224,9 +3994,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -4238,9 +4008,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4248,15 +4018,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -4267,7 +4037,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -4291,37 +4061,37 @@
+ //           Remote & Base  Proxy Broker Implementation
+ //
+ 
+-CORBA::_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
++_TAO_CORBA_Contained_Proxy_Broker::_TAO_CORBA_Contained_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
++_TAO_CORBA_Contained_Proxy_Broker::~_TAO_CORBA_Contained_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_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.
+-CORBA::_TAO_Contained_Remote_Proxy_Broker *
+-CORBA::_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 ::CORBA::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
++  static ::_TAO_CORBA_Contained_Remote_Proxy_Broker remote_proxy_broker;
+   return &remote_proxy_broker;
+ }
+ 
+-CORBA::_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
++_TAO_CORBA_Contained_Remote_Proxy_Broker::_TAO_CORBA_Contained_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
++_TAO_CORBA_Contained_Remote_Proxy_Broker::~_TAO_CORBA_Contained_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Contained_Proxy_Impl&
+-CORBA::_TAO_Contained_Remote_Proxy_Broker::select_proxy (
+-  ::CORBA::Contained *
++_TAO_CORBA_Contained_Proxy_Impl&
++_TAO_CORBA_Contained_Remote_Proxy_Broker::select_proxy (
++  ::CORBA_Contained *
+   ACE_ENV_ARG_DECL_NOT_USED
+ )
+ {
+@@ -4334,126 +4104,110 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
+-CORBA::Contained::Contained (int collocated)
++// default constructor
++CORBA_Contained::CORBA_Contained (int collocated)
+ {
+   this->CORBA_Contained_setup_collocation (collocated);
+ }
+ 
+-CORBA::Contained::~Contained (void)
++// destructor
++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_ =
+-      ::CORBA::_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 *_tao_void_pointer)
++void CORBA_Contained::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  Contained *tmp = ACE_static_cast (Contained*, _tao_void_pointer);
++  CORBA_Contained *tmp = ACE_static_cast (CORBA_Contained*, _tao_void_pointer);
+   CORBA::release (tmp);
+ }
+ 
+-CORBA::Contained_ptr CORBA::Contained::_narrow (
++CORBA_Contained_ptr CORBA_Contained::_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return 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);
-+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0", ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_Contained::_nil ());
+       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" ACE_ENV_ARG_PARAMETER);
+-      ACE_CHECK_RETURN (Contained::_nil ());
++      ACE_CHECK_RETURN (CORBA_Contained::_nil ());
        if (is_a == 0)
-         return CORBA_Contained::_nil ();
-@@ -4315,8 +4136,8 @@
- CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-        return Contained::_nil ();
++        return CORBA_Contained::_nil ();
+     }
+-  return Contained::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
++  return CORBA_Contained::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-CORBA::Contained_ptr 
+-CORBA::Contained::_unchecked_narrow (
++CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return Contained::_nil ();
++    return CORBA_Contained::_nil ();
+   if (! obj->_is_local ())
+     {
+       TAO_Stub* stub = obj->_stubobj ();
+       if (stub)
+         stub->_incr_refcnt ();
+-      Contained_ptr default_proxy = 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 ()
+-                ),
+-              Contained::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::CORBA::Contained (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              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 ());
+       return default_proxy;
+     }
+   else 
+     return
+       ACE_reinterpret_cast
+         (
+-          Contained_ptr,
++            CORBA_Contained_ptr,
+             obj->_tao_QueryInterface
+               (
+                 ACE_reinterpret_cast
+                   (
+                     ptr_arith_t,
+-                    &Contained::_tao_class_id
++                      &CORBA_Contained::_tao_class_id
+                   )
+               )
+         );
+ }
+ 
+-CORBA::Contained_ptr
+-CORBA::Contained::_duplicate (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 ACE_ENV_ARG_DECL)
++CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
  {
    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
-@@ -4353,7 +4174,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 (
-@@ -4523,13 +4344,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), 
-@@ -4736,37 +4557,6 @@
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+@@ -4464,22 +4218,22 @@
+     return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-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,
+-      &ACE_NESTED_CLASS (::CORBA, Contained)::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -4492,29 +4246,29 @@
+   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 (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.id (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-void CORBA::Contained::id (
++void CORBA_Contained::id (
+     const char * id
+     ACE_ENV_ARG_DECL
+   )
+@@ -4522,34 +4276,35 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+   
+   proxy.id (
+       this,
+-      id ACE_ENV_ARG_PARAMETER
++      id
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-char * CORBA::Contained::name (
+-    
++char * CORBA_Contained::name (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.name (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-void CORBA::Contained::name (
++void CORBA_Contained::name (
+     const char * name
+     ACE_ENV_ARG_DECL
+   )
+@@ -4557,34 +4312,35 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+   
+   proxy.name (
+       this,
+-      name ACE_ENV_ARG_PARAMETER
++      name
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-char * CORBA::Contained::version (
+-    
++char * CORBA_Contained::version (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.version (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-void CORBA::Contained::version (
++void CORBA_Contained::version (
+     const char * version
+     ACE_ENV_ARG_DECL
+   )
+@@ -4592,64 +4348,65 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+   
+   proxy.version (
+       this,
+-      version ACE_ENV_ARG_PARAMETER
++      version
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::Container_ptr CORBA::Contained::defined_in (
+-    
++CORBA_Container_ptr CORBA_Contained::defined_in (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.defined_in (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-char * CORBA::Contained::absolute_name (
+-    
++char * CORBA_Contained::absolute_name (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.absolute_name (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::Repository_ptr CORBA::Contained::containing_repository (
+-    
++CORBA_Repository_ptr CORBA_Contained::containing_repository (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.containing_repository (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -4822,37 +4579,37 @@
+     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 *_tao_void_pointer)
++void CORBA_Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
+ {
+   Description *tmp = ACE_static_cast (Description*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
+-::CORBA::Contained::Description * CORBA::Contained::describe (
+-    
++CORBA_Contained::Description * CORBA_Contained::describe (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.describe (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-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
+     ACE_ENV_ARG_DECL
+@@ -4861,50 +4618,19 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Contained_Proxy_Impl &proxy = 
+-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Contained_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+   
+   proxy.move (
+       this,
+       new_container,
+       new_name,
+-      new_version ACE_ENV_ARG_PARAMETER
++      new_version
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
@@ -297,15 +4179,14 @@
 -  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
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (
@@ -313,17 +4194,165 @@
 -    sizeof (_oc_CORBA_Contained),
 -    (char *) &_oc_CORBA_Contained,
 -    0,
--    sizeof (CORBA_Contained)
+-    sizeof (CORBA::Contained)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_Contained =
--  &_tc_TAO_tc_CORBA_Contained;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_CORBA_Contained)
+-TAO_NAMESPACE_END
 -
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
+ 
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
-@@ -4907,62 +4697,6 @@
+@@ -4912,19 +4638,19 @@
+ 
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::Contained **tmp = 0;
++  CORBA_Contained **tmp = 0;
+   tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
+   
+   if (this->buffer_ != 0)
+   {
+-    CORBA::Contained **old = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
++    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]);
++            tmp[i] = CORBA_Contained::_duplicate (old[i]);
+           }
+         else
+           {
+@@ -4941,55 +4667,55 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
+ {
+   if (this->buffer_ == 0 || this->release_ == 0)
+     return;
+-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
++  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 ();
++      tmp[i] = CORBA_Contained::_nil ();
+     }
+   
+   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+   this->buffer_ = 0;
+ }
+ 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+ {
+   this->_deallocate_buffer ();
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
++  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 ();
++      tmp[i] = CORBA_Contained::_nil ();
+     }
+ }
+ 
+ void 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
+     void* target,
+     CORBA_Object *src
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, target);
+-  *tmp = CORBA::Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
++  CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target);
++  *tmp = CORBA_Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+ }
+ 
+ CORBA_Object*
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
++_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
+ {
+-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, src);
++  CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, src);
+   return *tmp;
+ }
+ 
+@@ -5002,105 +4728,49 @@
+ #define _CORBA_CONTAINEDSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::ContainedSeq
++// CORBA_ContainedSeq
+ // *************************************************************
+ 
+-CORBA::ContainedSeq::ContainedSeq (void)
++CORBA_ContainedSeq::CORBA_ContainedSeq (void)
+ {}
+-CORBA::ContainedSeq::ContainedSeq (CORBA::ULong max) // uses max size
++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::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)
+ {}
+-CORBA::ContainedSeq::ContainedSeq (const ContainedSeq &seq) // copy ctor
++CORBA_ContainedSeq::CORBA_ContainedSeq (const CORBA_ContainedSeq &seq) // copy ctor
+   : 
+ #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)
+ {}
+-CORBA::ContainedSeq::~ContainedSeq (void) // dtor
++CORBA_ContainedSeq::~CORBA_ContainedSeq (void) // dtor
+ {}
+-void CORBA::ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*, _tao_void_pointer);
++  CORBA_ContainedSeq *tmp = ACE_static_cast (CORBA_ContainedSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -335,37 +4364,35 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x412f436f), 
 -  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
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
+-  13,
+-  ACE_NTOHL (0x436f6e74), 
+-  ACE_NTOHL (0x61696e65), 
+-  ACE_NTOHL (0x64536571), 
+-  ACE_NTOHL (0x0),  // name = ContainedSeq
 -  CORBA::tk_sequence, // typecode kind
--  76, // encapsulation length
+-  72, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    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
 -
 -    0U,
 -
@@ -376,17 +4403,147 @@
 -    sizeof (_oc_CORBA_ContainedSeq),
 -    (char *) &_oc_CORBA_ContainedSeq,
 -    0,
--    sizeof (CORBA_ContainedSeq)
+-    sizeof (CORBA::ContainedSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_ContainedSeq =
--  &_tc_TAO_tc_CORBA_ContainedSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ContainedSeq, &_tc_TAO_tc_CORBA_ContainedSeq)
+-TAO_NAMESPACE_END
 -
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
+ 
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
-@@ -5102,66 +4836,6 @@
+@@ -5108,14 +4778,14 @@
+ 
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::InterfaceDef **tmp = 0;
++  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_);
++    CORBA_InterfaceDef **old = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       {
+         if (!this->release_)
+@@ -5137,11 +4807,11 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (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_);
++  CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = 0; i < this->length_; ++i)
+     {
+@@ -5153,15 +4823,15 @@
+   this->buffer_ = 0;
+ }
+ 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
++_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
+ {
+   this->_deallocate_buffer ();
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+-  CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
++  CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = nl; i < ol; ++i)
+     {
+@@ -5171,19 +4841,19 @@
+ }
+ 
+ void 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
++_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
+     void* target,
+     CORBA_Object *src
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, target);
++  CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
+   *tmp = tao_CORBA_InterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+ }
+ 
+ CORBA_Object*
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
++_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
+ {
+   return tao_CORBA_InterfaceDef_upcast (src);
+ }
+@@ -5197,123 +4867,64 @@
+ #define _CORBA_INTERFACEDEFSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::InterfaceDefSeq
++// CORBA_InterfaceDefSeq
+ // *************************************************************
+ 
+-CORBA::InterfaceDefSeq::InterfaceDefSeq (void)
++CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
+ {}
+-CORBA::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max) // uses max size
++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>
++TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::InterfaceDef_ptr *buffer, CORBA::Boolean release)
++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>
++TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::InterfaceDefSeq::InterfaceDefSeq (const InterfaceDefSeq &seq) // copy ctor
++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>
++TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::InterfaceDefSeq::~InterfaceDefSeq (void) // dtor
++CORBA_InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
+ {}
+-void CORBA::InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  InterfaceDefSeq *tmp = ACE_static_cast (InterfaceDefSeq*, _tao_void_pointer);
++  CORBA_InterfaceDefSeq *tmp = ACE_static_cast (CORBA_InterfaceDefSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -398,44 +4555,42 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x412f496e), 
 -  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
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
+-  16,
+-  ACE_NTOHL (0x496e7465), 
+-  ACE_NTOHL (0x72666163), 
+-  ACE_NTOHL (0x65446566), 
+-  ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
 -  CORBA::tk_sequence, // typecode kind
--  84, // encapsulation length
+-  80, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_objref, // typecode kind
--    68, // encapsulation length
+-    64, // 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 (0x412f496e), 
 -      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
+-      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
 -
 -    0U,
--
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ 
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
@@ -443,17 +4598,149 @@
 -    sizeof (_oc_CORBA_InterfaceDefSeq),
 -    (char *) &_oc_CORBA_InterfaceDefSeq,
 -    0,
--    sizeof (CORBA_InterfaceDefSeq)
+-    sizeof (CORBA::InterfaceDefSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_InterfaceDefSeq =
--  &_tc_TAO_tc_CORBA_InterfaceDefSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_CORBA_InterfaceDefSeq)
+-TAO_NAMESPACE_END
 -
 -
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
++#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
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::ValueDef **tmp = 0;
++  CORBA_ValueDef **tmp = 0;
+   tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
    
- #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
-@@ -5301,62 +4975,6 @@
+   if (this->buffer_ != 0)
+   {
+-    CORBA::ValueDef **old = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
++    CORBA_ValueDef **old = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       {
+         if (!this->release_)
+@@ -5335,11 +4946,11 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (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_);
++  CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+   
+   for (CORBA::ULong i = 0; i < this->length_; ++i)
+     {
+@@ -5351,15 +4962,15 @@
+   this->buffer_ = 0;
+ }
+ 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
++_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
+ {
+   this->_deallocate_buffer ();
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+-  CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
++  CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+   
+   for (CORBA::ULong i = nl; i < ol; ++i)
+     {
+@@ -5369,19 +4980,19 @@
+ }
+ 
+ void 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
++_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
+     void* target,
+     CORBA_Object *src
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, target);
++  CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
+   *tmp = tao_CORBA_ValueDef_narrow (src ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+ }
+ 
+ CORBA_Object*
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
++_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
+ {
+   return tao_CORBA_ValueDef_upcast (src);
+ }
+@@ -5395,104 +5006,49 @@
+ #define _CORBA_VALUEDEFSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::ValueDefSeq
++// CORBA_ValueDefSeq
+ // *************************************************************
+ 
+-CORBA::ValueDefSeq::ValueDefSeq (void)
++CORBA_ValueDefSeq::CORBA_ValueDefSeq (void)
+ {}
+-CORBA::ValueDefSeq::ValueDefSeq (CORBA::ULong max) // uses max size
++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>
++TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::ValueDefSeq::ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ValueDef_ptr *buffer, CORBA::Boolean release)
++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>
++TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::ValueDefSeq::ValueDefSeq (const ValueDefSeq &seq) // copy ctor
++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>
++TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::ValueDefSeq::~ValueDefSeq (void) // dtor
++CORBA_ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
+ {}
+-void CORBA::ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  ValueDefSeq *tmp = ACE_static_cast (ValueDefSeq*, _tao_void_pointer);
++  CORBA_ValueDefSeq *tmp = ACE_static_cast (CORBA_ValueDefSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -465,37 +4752,34 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x412f5661), 
 -  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
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
+-  12,
+-  ACE_NTOHL (0x56616c75), 
+-  ACE_NTOHL (0x65446566), 
+-  ACE_NTOHL (0x53657100),  // name = ValueDefSeq
 -  CORBA::tk_sequence, // typecode kind
--  76, // encapsulation length
+-  72, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_objref, // typecode kind
--    60, // encapsulation length
+-    56, // 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 (0x412f5661), 
 -      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
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
+-      9,
+-      ACE_NTOHL (0x56616c75), 
+-      ACE_NTOHL (0x65446566), 
+-      ACE_NTOHL (0x0),  // name = ValueDef
 -
 -    0U,
 -
@@ -506,17 +4790,147 @@
 -    sizeof (_oc_CORBA_ValueDefSeq),
 -    (char *) &_oc_CORBA_ValueDefSeq,
 -    0,
--    sizeof (CORBA_ValueDefSeq)
+-    sizeof (CORBA::ValueDefSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_ValueDefSeq =
--  &_tc_TAO_tc_CORBA_ValueDefSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_CORBA_ValueDefSeq)
+-TAO_NAMESPACE_END
 -
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
+ 
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-@@ -5496,74 +5114,6 @@
+@@ -5500,14 +5056,14 @@
+ 
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::AbstractInterfaceDef **tmp = 0;
++  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_);
++    CORBA_AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       {
+         if (!this->release_)
+@@ -5529,11 +5085,11 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (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_);
++  CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = 0; i < this->length_; ++i)
+     {
+@@ -5545,15 +5101,15 @@
+   this->buffer_ = 0;
+ }
+ 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
++_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
+ {
+   this->_deallocate_buffer ();
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+-  CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
++  CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = nl; i < ol; ++i)
+     {
+@@ -5563,19 +5119,19 @@
+ }
+ 
+ void 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
++_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
+     void* target,
+     CORBA_Object *src
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  CORBA::AbstractInterfaceDef **tmp = ACE_static_cast (CORBA::AbstractInterfaceDef**, target);
++  CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
+   *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+ }
+ 
+ CORBA_Object*
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
++_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
+ {
+   return tao_CORBA_AbstractInterfaceDef_upcast (src);
+ }
+@@ -5589,116 +5145,49 @@
+ #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::AbstractInterfaceDefSeq
++// CORBA_AbstractInterfaceDefSeq
+ // *************************************************************
+ 
+-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void)
++CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (void)
+ {}
+-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (CORBA::ULong max) // uses max size
++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>
++TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::AbstractInterfaceDef_ptr *buffer, CORBA::Boolean release)
++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>
++TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &seq) // copy ctor
++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>
++TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::AbstractInterfaceDefSeq::~AbstractInterfaceDefSeq (void) // dtor
++CORBA_AbstractInterfaceDefSeq::~CORBA_AbstractInterfaceDefSeq (void) // dtor
+ {}
+-void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  AbstractInterfaceDefSeq *tmp = ACE_static_cast (AbstractInterfaceDefSeq*, _tao_void_pointer);
++  CORBA_AbstractInterfaceDefSeq *tmp = ACE_static_cast (CORBA_AbstractInterfaceDefSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -528,49 +4942,46 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f4162), 
+-  ACE_NTOHL (0x412f4162), 
 -  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
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
+-  24,
+-  ACE_NTOHL (0x41627374), 
+-  ACE_NTOHL (0x72616374), 
+-  ACE_NTOHL (0x496e7465), 
+-  ACE_NTOHL (0x72666163), 
+-  ACE_NTOHL (0x65446566), 
+-  ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
 -  CORBA::tk_sequence, // typecode kind
--  100, // encapsulation length
+-  96, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_objref, // typecode kind
--    84, // encapsulation length
+-    80, // 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 (0x412f4162), 
 -      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
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
+-      21,
+-      ACE_NTOHL (0x41627374), 
+-      ACE_NTOHL (0x72616374), 
+-      ACE_NTOHL (0x496e7465), 
+-      ACE_NTOHL (0x72666163), 
+-      ACE_NTOHL (0x65446566), 
+-      ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
 -
 -    0U,
 -
@@ -581,17 +4992,147 @@
 -    sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
 -    (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
 -    0,
--    sizeof (CORBA_AbstractInterfaceDefSeq)
+-    sizeof (CORBA::AbstractInterfaceDefSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_AbstractInterfaceDefSeq =
--  &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AbstractInterfaceDefSeq, &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq)
+-TAO_NAMESPACE_END
 -
 -
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
+ 
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-@@ -5703,134 +5253,6 @@
+@@ -5706,14 +5195,14 @@
+ 
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::LocalInterfaceDef **tmp = 0;
++  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_);
++    CORBA_LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       {
+         if (!this->release_)
+@@ -5735,11 +5224,11 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (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_);
++  CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = 0; i < this->length_; ++i)
+     {
+@@ -5751,15 +5240,15 @@
+   this->buffer_ = 0;
+ }
+ 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
++_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
+ {
+   this->_deallocate_buffer ();
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+-  CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
++  CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+   
+   for (CORBA::ULong i = nl; i < ol; ++i)
+     {
+@@ -5769,19 +5258,19 @@
+ }
+ 
+ void 
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
++_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
+     void* target,
+     CORBA_Object *src
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  CORBA::LocalInterfaceDef **tmp = ACE_static_cast (CORBA::LocalInterfaceDef**, target);
++  CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
+   *tmp = tao_CORBA_LocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
+ }
+ 
+ CORBA_Object*
+-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
++_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
+ {
+   return tao_CORBA_LocalInterfaceDef_upcast (src);
+ }
+@@ -5795,197 +5284,52 @@
+ #define _CORBA_LOCALINTERFACEDEFSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::LocalInterfaceDefSeq
++// CORBA_LocalInterfaceDefSeq
+ // *************************************************************
+ 
+-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void)
++CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (void)
+ {}
+-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (CORBA::ULong max) // uses max size
++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>
++TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::LocalInterfaceDef_ptr *buffer, CORBA::Boolean release)
++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>
++TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (const LocalInterfaceDefSeq &seq) // copy ctor
++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>
++TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::LocalInterfaceDefSeq::~LocalInterfaceDefSeq (void) // dtor
++CORBA_LocalInterfaceDefSeq::~CORBA_LocalInterfaceDefSeq (void) // dtor
+ {}
+-void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  LocalInterfaceDefSeq *tmp = ACE_static_cast (LocalInterfaceDefSeq*, _tao_void_pointer);
++  CORBA_LocalInterfaceDefSeq *tmp = ACE_static_cast (CORBA_LocalInterfaceDefSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -603,45 +5144,43 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f4c6f), 
+-  ACE_NTOHL (0x412f4c6f), 
 -  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
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
+-  21,
+-  ACE_NTOHL (0x4c6f6361), 
+-  ACE_NTOHL (0x6c496e74), 
+-  ACE_NTOHL (0x65726661), 
+-  ACE_NTOHL (0x63654465), 
+-  ACE_NTOHL (0x66536571), 
+-  ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
 -  CORBA::tk_sequence, // typecode kind
--  92, // encapsulation length
+-  88, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_objref, // typecode kind
--    76, // encapsulation length
+-    72, // 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 (0x412f4c6f), 
 -      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
+-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
+-      18,
+-      ACE_NTOHL (0x4c6f6361), 
+-      ACE_NTOHL (0x6c496e74), 
+-      ACE_NTOHL (0x65726661), 
+-      ACE_NTOHL (0x63654465), 
+-      ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
 -
 -    0U,
 -
@@ -652,11 +5191,13 @@
 -    sizeof (_oc_CORBA_LocalInterfaceDefSeq),
 -    (char *) &_oc_CORBA_LocalInterfaceDefSeq,
 -    0,
--    sizeof (CORBA_LocalInterfaceDefSeq)
+-    sizeof (CORBA::LocalInterfaceDefSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_LocalInterfaceDefSeq =
--  &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_LocalInterfaceDefSeq, &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq)
+-TAO_NAMESPACE_END
 -
 -static const CORBA::Long _oc_CORBA_StructMember[] =
 -{
@@ -666,23 +5207,40 @@
 -  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_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
+-
 -  5,
 -  ACE_NTOHL (0x74797065), 
 -  ACE_NTOHL (0x0),  // name = type
@@ -693,22 +5251,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
 -
 -};
 -
@@ -717,73 +5273,185 @@
 -    sizeof (_oc_CORBA_StructMember),
 -    (char *) &_oc_CORBA_StructMember,
 -    0,
--    sizeof (CORBA_StructMember)
+-    sizeof (CORBA::StructMember)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_StructMember =
--  &_tc_TAO_tc_CORBA_StructMember;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_StructMember, &_tc_TAO_tc_CORBA_StructMember)
+-TAO_NAMESPACE_END
 -
- void CORBA_StructMember::_tao_any_destructor (void *x)
+-void CORBA::StructMember::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_StructMember::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  StructMember *tmp = ACE_static_cast (StructMember*, _tao_void_pointer);
++  CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
+@@ -5996,14 +5340,14 @@
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_
+ 
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
  {
-   CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*,x);
-@@ -5928,223 +5350,10 @@
+-  CORBA::StructMember* tmp = 0;
++  CORBA_StructMember* tmp = 0;
+   tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
+   
+   if (this->buffer_ != 0)
+   {
+-    CORBA::StructMember *old = ACE_reinterpret_cast (CORBA::StructMember *,this->buffer_);
++    CORBA_StructMember *old = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
+     
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       tmp[i] = old[i];
+@@ -6016,18 +5360,18 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
++_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
+ {
+   if (this->buffer_ == 0 || this->release_ == 0)
+     return;
+   
+-  CORBA::StructMember *tmp = ACE_reinterpret_cast (CORBA::StructMember *,this->buffer_);
++  CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
+   
+   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
+   this->buffer_ = 0;
+ } 
+ 
+-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
++_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
+ {
+   this->_deallocate_buffer ();
+ }
+@@ -6042,293 +5386,52 @@
+ #define _CORBA_STRUCTMEMBERSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::StructMemberSeq
++// CORBA_StructMemberSeq
+ // *************************************************************
+ 
+-CORBA::StructMemberSeq::StructMemberSeq (void)
++CORBA_StructMemberSeq::CORBA_StructMemberSeq (void)
+ {}
+-CORBA::StructMemberSeq::StructMemberSeq (CORBA::ULong max) // uses max size
++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::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)
+ {}
+-CORBA::StructMemberSeq::StructMemberSeq (const StructMemberSeq &seq) // copy ctor
++CORBA_StructMemberSeq::CORBA_StructMemberSeq (const CORBA_StructMemberSeq &seq) // copy ctor
+   : 
+ #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)
+ {}
+-CORBA::StructMemberSeq::~StructMemberSeq (void) // dtor
++CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
+ {}
+-void CORBA::StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
  {
-   CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
+-  StructMemberSeq *tmp = ACE_static_cast (StructMemberSeq*, _tao_void_pointer);
++  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*, _tao_void_pointer);
    delete tmp;
--}
--
--
--#endif /* end #if !defined */
--
+ }
+ 
+ 
+ #endif /* end #if !defined */
+ 
 -static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
--{
++void CORBA_Initializer::_tao_any_destructor (void *_tao_void_pointer)
+ {
 -  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_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
+-
 -      5,
 -      ACE_NTOHL (0x74797065), 
 -      ACE_NTOHL (0x0),  // name = type
@@ -794,22 +5462,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,
@@ -821,11 +5487,13 @@
 -    sizeof (_oc_CORBA_StructMemberSeq),
 -    (char *) &_oc_CORBA_StructMemberSeq,
 -    0,
--    sizeof (CORBA_StructMemberSeq)
+-    sizeof (CORBA::StructMemberSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_StructMemberSeq =
--  &_tc_TAO_tc_CORBA_StructMemberSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_StructMemberSeq, &_tc_TAO_tc_CORBA_StructMemberSeq)
+-TAO_NAMESPACE_END
 -
 -static const CORBA::Long _oc_CORBA_Initializer[] =
 -{
@@ -835,70 +5503,83 @@
 -  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_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
+-
 -        5,
 -        ACE_NTOHL (0x74797065), 
 -        ACE_NTOHL (0x0),  // name = type
@@ -909,22 +5590,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,
@@ -933,8 +5612,8 @@
 -  5,
 -  ACE_NTOHL (0x6e616d65), 
 -  ACE_NTOHL (0x0),  // name = name
--  CORBA::tk_string, 
--  0U, // string length
+-  0xffffffff, // indirection
+-  0xffffff44, // negative offset (-188)
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
@@ -942,18 +5621,116 @@
 -    sizeof (_oc_CORBA_Initializer),
 -    (char *) &_oc_CORBA_Initializer,
 -    0,
--    sizeof (CORBA_Initializer)
+-    sizeof (CORBA::Initializer)
 -  );
-+}
-+
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Initializer, &_tc_TAO_tc_CORBA_Initializer)
+-TAO_NAMESPACE_END
+-
+-void CORBA::Initializer::_tao_any_destructor (void *_tao_void_pointer)
+-{
+-  Initializer *tmp = ACE_static_cast (Initializer*, _tao_void_pointer);
++  CORBA_Initializer *tmp = ACE_static_cast (CORBA_Initializer*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
+@@ -6339,14 +5442,14 @@
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_
+ 
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  CORBA::Initializer* tmp = 0;
++  CORBA_Initializer* tmp = 0;
+   tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
+   
+   if (this->buffer_ != 0)
+   {
+-    CORBA::Initializer *old = ACE_reinterpret_cast (CORBA::Initializer *,this->buffer_);
++    CORBA_Initializer *old = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
+     
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       tmp[i] = old[i];
+@@ -6359,18 +5462,18 @@
+ }
  
--CORBA::TypeCode_ptr _tc_CORBA_Initializer =
--  &_tc_TAO_tc_CORBA_Initializer;
-+#endif /* end #if !defined */
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
++_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
+ {
+   if (this->buffer_ == 0 || this->release_ == 0)
+     return;
+   
+-  CORBA::Initializer *tmp = ACE_reinterpret_cast (CORBA::Initializer *,this->buffer_);
++  CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
+   
+   _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
+   this->buffer_ = 0;
+ } 
  
- void CORBA_Initializer::_tao_any_destructor (void *x)
+-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
++_TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
+ {
+   this->_deallocate_buffer ();
+ }
+@@ -6385,297 +5488,53 @@
+ #define _CORBA_INITIALIZERSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::InitializerSeq
++// CORBA_InitializerSeq
+ // *************************************************************
+ 
+-CORBA::InitializerSeq::InitializerSeq (void)
++CORBA_InitializerSeq::CORBA_InitializerSeq (void)
+ {}
+-CORBA::InitializerSeq::InitializerSeq (CORBA::ULong max) // uses max size
++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::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)
+ {}
+-CORBA::InitializerSeq::InitializerSeq (const InitializerSeq &seq) // copy ctor
++CORBA_InitializerSeq::CORBA_InitializerSeq (const CORBA_InitializerSeq &seq) // copy ctor
+   : 
+ #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)
+ {}
+-CORBA::InitializerSeq::~InitializerSeq (void) // dtor
++CORBA_InitializerSeq::~CORBA_InitializerSeq (void) // dtor
+ {}
+-void CORBA::InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
  {
-@@ -6248,224 +5457,6 @@
+-  InitializerSeq *tmp = ACE_static_cast (InitializerSeq*, _tao_void_pointer);
++  CORBA_InitializerSeq *tmp = ACE_static_cast (CORBA_InitializerSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -965,94 +5742,105 @@
 -  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
+-  460, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_struct, // typecode kind
--    404, // encapsulation length
+-    444, // 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_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
+-
 -            5,
 -            ACE_NTOHL (0x74797065), 
 -            ACE_NTOHL (0x0),  // name = type
@@ -1063,23 +5851,21 @@
 -            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,
 -
@@ -1087,8 +5873,8 @@
 -      5,
 -      ACE_NTOHL (0x6e616d65), 
 -      ACE_NTOHL (0x0),  // name = name
--      CORBA::tk_string, 
--      0U, // string length
+-      0xffffffff, // indirection
+-      0xffffff44, // negative offset (-188)
 -
 -    0U,
 -
@@ -1099,37 +5885,56 @@
 -    sizeof (_oc_CORBA_InitializerSeq),
 -    (char *) &_oc_CORBA_InitializerSeq,
 -    0,
--    sizeof (CORBA_InitializerSeq)
+-    sizeof (CORBA::InitializerSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_InitializerSeq =
--  &_tc_TAO_tc_CORBA_InitializerSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_InitializerSeq, &_tc_TAO_tc_CORBA_InitializerSeq)
+-TAO_NAMESPACE_END
 -
 -static const CORBA::Long _oc_CORBA_UnionMember[] =
--{
++void CORBA_UnionMember::_tao_any_destructor (void *_tao_void_pointer)
+ {
 -  TAO_ENCAP_BYTE_ORDER, // byte order
 -  34,
 -  ACE_NTOHL (0x49444c3a), 
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x412f556e), 
 -  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
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
+-  12,
+-  ACE_NTOHL (0x556e696f), 
+-  ACE_NTOHL (0x6e4d656d), 
+-  ACE_NTOHL (0x62657200),  // name = UnionMember
 -  4, // member count
 -  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
+-
 -  6,
 -  ACE_NTOHL (0x6c616265), 
 -  ACE_NTOHL (0x6c000000),  // name = label
@@ -1145,22 +5950,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
 -
 -};
 -
@@ -1169,16 +5972,116 @@
 -    sizeof (_oc_CORBA_UnionMember),
 -    (char *) &_oc_CORBA_UnionMember,
 -    0,
--    sizeof (CORBA_UnionMember)
+-    sizeof (CORBA::UnionMember)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_UnionMember =
--  &_tc_TAO_tc_CORBA_UnionMember;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_UnionMember, &_tc_TAO_tc_CORBA_UnionMember)
+-TAO_NAMESPACE_END
 -
- void CORBA_UnionMember::_tao_any_destructor (void *x)
+-void CORBA::UnionMember::_tao_any_destructor (void *_tao_void_pointer)
+-{
+-  UnionMember *tmp = ACE_static_cast (UnionMember*, _tao_void_pointer);
++  CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
+@@ -6686,14 +5545,14 @@
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_
+ 
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
++_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
  {
-   CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*,x);
-@@ -6568,104 +5559,6 @@
+-  CORBA::UnionMember* tmp = 0;
++  CORBA_UnionMember* tmp = 0;
+   tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
+   
+   if (this->buffer_ != 0)
+   {
+-    CORBA::UnionMember *old = ACE_reinterpret_cast (CORBA::UnionMember *,this->buffer_);
++    CORBA_UnionMember *old = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
+     
+     for (CORBA::ULong i = 0; i < this->length_; ++i)
+       tmp[i] = old[i];
+@@ -6706,18 +5565,18 @@
+ }
+ 
+ void
+-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
++_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
+ {
+   if (this->buffer_ == 0 || this->release_ == 0)
+     return;
+   
+-  CORBA::UnionMember *tmp = ACE_reinterpret_cast (CORBA::UnionMember *,this->buffer_);
++  CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
+   
+   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
+   this->buffer_ = 0;
+ } 
+ 
+-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
++_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
+ {
+   this->_deallocate_buffer ();
+ }
+@@ -6732,171 +5591,59 @@
+ #define _CORBA_UNIONMEMBERSEQ_CS_
+ 
+ // *************************************************************
+-// CORBA::UnionMemberSeq
++// CORBA_UnionMemberSeq
+ // *************************************************************
+ 
+-CORBA::UnionMemberSeq::UnionMemberSeq (void)
++CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (void)
+ {}
+-CORBA::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max) // uses max size
++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::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)
+ {}
+-CORBA::UnionMemberSeq::UnionMemberSeq (const UnionMemberSeq &seq) // copy ctor
++CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &seq) // copy ctor
+   : 
+ #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)
+ {}
+-CORBA::UnionMemberSeq::~UnionMemberSeq (void) // dtor
++CORBA_UnionMemberSeq::~CORBA_UnionMemberSeq (void) // dtor
+ {}
+-void CORBA::UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  UnionMemberSeq *tmp = ACE_static_cast (UnionMemberSeq*, _tao_void_pointer);
++  CORBA_UnionMemberSeq *tmp = ACE_static_cast (CORBA_UnionMemberSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -1190,47 +6093,61 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x412f556e), 
 -  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
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
+-  15,
+-  ACE_NTOHL (0x556e696f), 
+-  ACE_NTOHL (0x6e4d656d), 
+-  ACE_NTOHL (0x62657253), 
+-  ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
 -  CORBA::tk_sequence, // typecode kind
--  224, // encapsulation length
+-  276, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
 -    CORBA::tk_struct, // typecode kind
--    208, // encapsulation length
+-    260, // 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 (0x412f556e), 
 -      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
+-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
+-      12,
+-      ACE_NTOHL (0x556e696f), 
+-      ACE_NTOHL (0x6e4d656d), 
+-      ACE_NTOHL (0x62657200),  // name = UnionMember
 -      4, // member count
 -      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
+-
 -      6,
 -      ACE_NTOHL (0x6c616265), 
 -      ACE_NTOHL (0x6c000000),  // name = label
@@ -1246,22 +6163,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,
@@ -1273,17 +6188,64 @@
 -    sizeof (_oc_CORBA_UnionMemberSeq),
 -    (char *) &_oc_CORBA_UnionMemberSeq,
 -    0,
--    sizeof (CORBA_UnionMemberSeq)
+-    sizeof (CORBA::UnionMemberSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_UnionMemberSeq =
--  &_tc_TAO_tc_CORBA_UnionMemberSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_UnionMemberSeq, &_tc_TAO_tc_CORBA_UnionMemberSeq)
+-TAO_NAMESPACE_END
 -
 -
  #if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
  #define _CORBA_ENUMMEMBERSEQ_CS_
  
-@@ -6713,45 +5606,6 @@
+ // *************************************************************
+-// CORBA::EnumMemberSeq
++// CORBA_EnumMemberSeq
+ // *************************************************************
+ 
+-CORBA::EnumMemberSeq::EnumMemberSeq (void)
++CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (void)
+ {}
+-CORBA::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max) // uses max size
++CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max) // uses max size
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -6905,7 +5652,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -6914,7 +5661,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::EnumMemberSeq::EnumMemberSeq (const EnumMemberSeq &seq) // copy ctor
++CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &seq) // copy ctor
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -6923,112 +5670,48 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::EnumMemberSeq::~EnumMemberSeq (void) // dtor
++CORBA_EnumMemberSeq::~CORBA_EnumMemberSeq (void) // dtor
+ {}
+-void CORBA::EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  EnumMemberSeq *tmp = ACE_static_cast (EnumMemberSeq*, _tao_void_pointer);
++  CORBA_EnumMemberSeq *tmp = ACE_static_cast (CORBA_EnumMemberSeq*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
  
  #endif /* end #if !defined */
  
@@ -1295,22 +6257,39 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f456e), 
+-  ACE_NTOHL (0x412f456e), 
 -  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
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
+-  14,
+-  ACE_NTOHL (0x456e756d), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65725365), 
+-  ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
 -  CORBA::tk_sequence, // typecode kind
--  16, // encapsulation length
+-  84, // encapsulation length
 -    TAO_ENCAP_BYTE_ORDER, // byte order
--    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
+-
 -    0U,
 -
 -};
@@ -1320,165 +6299,5414 @@
 -    sizeof (_oc_CORBA_EnumMemberSeq),
 -    (char *) &_oc_CORBA_EnumMemberSeq,
 -    0,
--    sizeof (CORBA_EnumMemberSeq)
+-    sizeof (CORBA::EnumMemberSeq)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_EnumMemberSeq =
--  &_tc_TAO_tc_CORBA_EnumMemberSeq;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_CORBA_EnumMemberSeq)
+-TAO_NAMESPACE_END
+-
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int CORBA::Container::_tao_class_id = 0;
 -
- CORBA_Container_ptr
+-CORBA::Container_ptr
++CORBA_Container_ptr
  tao_CORBA_Container_duplicate (
-     CORBA_Container_ptr p
-@@ -12409,7 +11263,7 @@
-     return CORBA_Container::_nil ();
+-    CORBA::Container_ptr p
++    CORBA_Container_ptr p
+   )
+ {
+-  return CORBA::Container::_duplicate (p);
++  return CORBA_Container::_duplicate (p);
+ }
+ 
+ void
+ tao_CORBA_Container_release (
+-    CORBA::Container_ptr p
++    CORBA_Container_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-CORBA::Container_ptr
++CORBA_Container_ptr
+ tao_CORBA_Container_nil (
+     void
+   )
+ {
+-  return CORBA::Container::_nil ();
++  return CORBA_Container::_nil ();
+ }
+ 
+-CORBA::Container_ptr
++CORBA_Container_ptr
+ tao_CORBA_Container_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return CORBA::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+@@ -7036,193 +5719,191 @@
+     void *src
+   )
+ {
+-  CORBA::Container **tmp =
+-    ACE_static_cast (CORBA::Container **, src);
++  CORBA_Container **tmp =
++    ACE_static_cast (CORBA_Container **, src);
+   return *tmp;
+ }
+ 
++int CORBA_Container::_tao_class_id = 0;
++
+ // *************************************************************
+-// CORBA::Container_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class CORBA_Container_var
+ // *************************************************************
+ 
+-CORBA::Container_var::Container_var (void) // default constructor
+-  : ptr_ (Container::_nil ())
++CORBA_Container_var::CORBA_Container_var (void) // default constructor
++  : ptr_ (CORBA_Container::_nil ())
+ {}
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::ptr (void) const
++::CORBA_Container_ptr
++CORBA_Container_var::ptr (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::Container_var::Container_var (const ::CORBA::Container_var &p) // copy constructor
++CORBA_Container_var::CORBA_Container_var (const ::CORBA_Container_var &p) // copy constructor
+   : TAO_Base_var (),
+-    ptr_ (Container::_duplicate (p.ptr ()))
++    ptr_ (CORBA_Container::_duplicate (p.ptr ()))
+ {}
+ 
+-CORBA::Container_var::~Container_var (void) // destructor
++CORBA_Container_var::~CORBA_Container_var (void) // destructor
+ {
+   CORBA::release (this->ptr_);
+ }
+ 
+-CORBA::Container_var &
+-CORBA::Container_var::operator= (Container_ptr p)
++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)
++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 ());
++    this->ptr_ = ::CORBA_Container::_duplicate (p.ptr ());
+   }
+   return *this;
+ }
+ 
+-CORBA::Container_var::operator const ::CORBA::Container_ptr &() const // cast
++CORBA_Container_var::operator const ::CORBA_Container_ptr &() const // cast
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::Container_var::operator ::CORBA::Container_ptr &() // cast 
++CORBA_Container_var::operator ::CORBA_Container_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::operator-> (void) const
++::CORBA_Container_ptr
++CORBA_Container_var::operator-> (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::in (void) const
++::CORBA_Container_ptr
++CORBA_Container_var::in (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr &
+-CORBA::Container_var::inout (void)
++::CORBA_Container_ptr &
++CORBA_Container_var::inout (void)
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr &
+-CORBA::Container_var::out (void)
++::CORBA_Container_ptr &
++CORBA_Container_var::out (void)
+ {
+   CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA::Container::_nil ();
++  this->ptr_ = ::CORBA_Container::_nil ();
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::_retn (void)
++::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 ();
++  ::CORBA_Container_ptr val = this->ptr_;
++  this->ptr_ = ::CORBA_Container::_nil ();
+   return val;
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::tao_duplicate (Container_ptr p)
++::CORBA_Container_ptr
++CORBA_Container_var::tao_duplicate (CORBA_Container_ptr p)
+ {
+-  return ::CORBA::Container::_duplicate (p);
++  return ::CORBA_Container::_duplicate (p);
+ }
+ 
+ void
+-CORBA::Container_var::tao_release (Container_ptr p)
++CORBA_Container_var::tao_release (CORBA_Container_ptr p)
+ {
+   CORBA::release (p);
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::tao_nil (void)
++::CORBA_Container_ptr
++CORBA_Container_var::tao_nil (void)
+ {
+-  return ::CORBA::Container::_nil ();
++  return ::CORBA_Container::_nil ();
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_var::tao_narrow (
++::CORBA_Container_ptr
++CORBA_Container_var::tao_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return ::CORBA::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return ::CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+-CORBA::Container_var::tao_upcast (void *src)
++CORBA_Container_var::tao_upcast (void *src)
+ {
+-  Container **tmp =
+-    ACE_static_cast (Container **, src);
++  CORBA_Container **tmp =
++    ACE_static_cast (CORBA_Container **, src);
+   return *tmp;
+ }
+ 
+ // *************************************************************
+-// CORBA::Container_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class CORBA_Container_out
+ // *************************************************************
+ 
+-CORBA::Container_out::Container_out (Container_ptr &p)
++CORBA_Container_out::CORBA_Container_out (CORBA_Container_ptr &p)
+   : ptr_ (p)
+ {
+-  this->ptr_ = ::CORBA::Container::_nil ();
++  this->ptr_ = ::CORBA_Container::_nil ();
+ }
+ 
+-CORBA::Container_out::Container_out (Container_var &p) // constructor from _var
++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 ();
++  this->ptr_ = ::CORBA_Container::_nil ();
+ }
+ 
+-CORBA::Container_out::Container_out (const ::CORBA::Container_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (Container_out &, p).ptr_)
++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)
++::CORBA_Container_out &
++CORBA_Container_out::operator= (const ::CORBA_Container_out &p)
+ {
+-  this->ptr_ = ACE_const_cast (Container_out&, p).ptr_;
++  this->ptr_ = ACE_const_cast (CORBA_Container_out&, p).ptr_;
+   return *this;
+ }
+ 
+-CORBA::Container_out &
+-CORBA::Container_out::operator= (const ::CORBA::Container_var &p)
++CORBA_Container_out &
++CORBA_Container_out::operator= (const ::CORBA_Container_var &p)
+ {
+-  this->ptr_ = ::CORBA::Container::_duplicate (p.ptr ());
++  this->ptr_ = ::CORBA_Container::_duplicate (p.ptr ());
+   return *this;
+ }
+ 
+-CORBA::Container_out &
+-CORBA::Container_out::operator= (Container_ptr p)
++CORBA_Container_out &
++CORBA_Container_out::operator= (CORBA_Container_ptr p)
+ {
+   this->ptr_ = p;
+   return *this;
+ }
+ 
+-CORBA::Container_out::operator ::CORBA::Container_ptr &() // cast
++CORBA_Container_out::operator ::CORBA_Container_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr &
+-CORBA::Container_out::ptr (void) // ptr
++::CORBA_Container_ptr &
++CORBA_Container_out::ptr (void) // ptr
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::Container_ptr
+-CORBA::Container_out::operator-> (void)
++::CORBA_Container_ptr
++CORBA_Container_out::operator-> (void)
+ {
+   return this->ptr_;
+ }
+@@ -7235,32 +5916,40 @@
+   TAO_ClientRequestInfo_CORBA_Container_lookup (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * search_name ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * search_name
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+-    const char * search_name ACE_ENV_ARG_DECL_NOT_USED    
++    const char * search_name
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     search_name_ (search_name)
+@@ -7299,6 +5988,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7316,7 +6006,7 @@
+ }
+ 
+ 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;
+@@ -7329,19 +6019,26 @@
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+       CORBA::DefinitionKind & limit_type,
+-      const CORBA::Boolean & exclude_inherited ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA::Boolean & exclude_inherited
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7349,14 +6046,15 @@
+ 
+   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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+     CORBA::DefinitionKind & limit_type,
+-    const CORBA::Boolean & exclude_inherited ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA::Boolean & exclude_inherited
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     limit_type_ (limit_type),
+@@ -7399,6 +6097,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7416,7 +6115,7 @@
+ }
+ 
+ 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;
+@@ -7431,19 +6130,26 @@
+       const char * search_name,
+       const CORBA::Long & levels_to_search,
+       CORBA::DefinitionKind & limit_type,
+-      const CORBA::Boolean & exclude_inherited ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA::Boolean & exclude_inherited
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7453,7 +6159,7 @@
+   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 (
+@@ -7462,7 +6168,8 @@
+     const char * search_name,
+     const CORBA::Long & levels_to_search,
+     CORBA::DefinitionKind & limit_type,
+-    const CORBA::Boolean & exclude_inherited ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA::Boolean & exclude_inherited
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     search_name_ (search_name),
+@@ -7513,6 +6220,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7530,7 +6238,7 @@
+ }
+ 
+ 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;
+@@ -7544,19 +6252,26 @@
+       CORBA::Object_ptr _tao_target,
+       CORBA::DefinitionKind & limit_type,
+       const CORBA::Boolean & exclude_inherited,
+-      const CORBA::Long & max_returned_objs ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA::Long & max_returned_objs
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7565,7 +6280,7 @@
+   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 (
+@@ -7573,7 +6288,8 @@
+     CORBA::Object_ptr _tao_target,
+     CORBA::DefinitionKind & limit_type,
+     const CORBA::Boolean & exclude_inherited,
+-    const CORBA::Long & max_returned_objs ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA::Long & max_returned_objs
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     limit_type_ (limit_type),
+@@ -7620,6 +6336,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7637,7 +6354,7 @@
+ }
+ 
+ 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;
+@@ -7651,19 +6368,26 @@
+       CORBA::Object_ptr _tao_target,
+       const char * id,
+       const char * name,
+-      const char * version ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * version
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7672,7 +6396,7 @@
+   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 (
+@@ -7680,7 +6404,8 @@
+     CORBA::Object_ptr _tao_target,
+     const char * id,
+     const char * name,
+-    const char * version ACE_ENV_ARG_DECL_NOT_USED    
++    const char * version
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -7727,6 +6452,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7744,7 +6470,7 @@
+ }
+ 
+ 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;
+@@ -7759,20 +6485,27 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::IDLType_ptr type,
+-      const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_IDLType_ptr type,
++      const CORBA::Any & value
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7781,9 +6514,9 @@
+   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 (
+@@ -7792,8 +6525,9 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::IDLType_ptr type,
+-    const CORBA::Any & value ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_IDLType_ptr type,
++    const CORBA::Any & value
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -7848,6 +6582,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7865,7 +6600,7 @@
+ }
+ 
+ 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;
+@@ -7880,19 +6615,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_StructMemberSeq & members
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -7901,8 +6643,8 @@
+   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 (
+@@ -7911,7 +6653,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_StructMemberSeq & members
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -7962,6 +6705,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -7979,7 +6723,7 @@
+ }
+ 
+ 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;
+@@ -7994,20 +6738,27 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::IDLType_ptr discriminator_type,
+-      const CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_IDLType_ptr discriminator_type,
++      const CORBA_UnionMemberSeq & members
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8016,9 +6767,9 @@
+   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 (
+@@ -8027,8 +6778,9 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::IDLType_ptr discriminator_type,
+-    const CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_IDLType_ptr discriminator_type,
++    const CORBA_UnionMemberSeq & members
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8083,6 +6835,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8100,7 +6853,7 @@
+ }
+ 
+ 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;
+@@ -8115,19 +6868,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_EnumMemberSeq & members
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8136,8 +6896,8 @@
+   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 (
+@@ -8146,7 +6906,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_EnumMemberSeq & members
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8197,6 +6958,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8214,7 +6976,7 @@
+ }
+ 
+ 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;
+@@ -8229,19 +6991,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_IDLType_ptr original_type
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8250,8 +7019,8 @@
+   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 (
+@@ -8260,7 +7029,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_IDLType_ptr original_type
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8311,6 +7081,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8328,7 +7099,7 @@
+ }
+ 
+ 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;
+@@ -8343,19 +7114,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_InterfaceDefSeq & base_interfaces
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8364,8 +7142,8 @@
+   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 (
+@@ -8374,7 +7152,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_InterfaceDefSeq & base_interfaces
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8425,6 +7204,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8442,7 +7222,7 @@
+ }
+ 
+ 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;
+@@ -8459,23 +7239,30 @@
+       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 ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_ValueDefSeq & abstract_base_values,
++      const CORBA_InterfaceDefSeq & supported_interfaces,
++      const CORBA_InitializerSeq & initializers
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8486,12 +7273,12 @@
+   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 (
+@@ -8502,11 +7289,12 @@
+     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 ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_ValueDefSeq & abstract_base_values,
++    const CORBA_InterfaceDefSeq & supported_interfaces,
++    const CORBA_InitializerSeq & initializers
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8581,6 +7369,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8598,7 +7387,7 @@
+ }
+ 
+ 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;
+@@ -8613,19 +7402,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_IDLType_ptr original_type_def
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8634,8 +7430,8 @@
+   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 (
+@@ -8644,7 +7440,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_IDLType_ptr original_type_def
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8695,6 +7492,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8712,7 +7510,7 @@
+ }
+ 
+ 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;
+@@ -8727,19 +7525,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_StructMemberSeq & members
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8748,8 +7553,8 @@
+   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 (
+@@ -8758,7 +7563,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_StructMemberSeq & members
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8809,6 +7615,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8826,7 +7633,7 @@
+ }
+ 
+ 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;
+@@ -8840,19 +7647,26 @@
+       CORBA::Object_ptr _tao_target,
+       const char * id,
+       const char * name,
+-      const char * version ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * version
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8861,7 +7675,7 @@
+   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 (
+@@ -8869,7 +7683,8 @@
+     CORBA::Object_ptr _tao_target,
+     const char * id,
+     const char * name,
+-    const char * version ACE_ENV_ARG_DECL_NOT_USED    
++    const char * version
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -8916,6 +7731,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -8933,7 +7749,7 @@
+ }
+ 
+ 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;
+@@ -8948,19 +7764,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::AbstractInterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_AbstractInterfaceDefSeq & base_interfaces
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -8969,8 +7792,8 @@
+   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 (
+@@ -8979,7 +7802,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::AbstractInterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_AbstractInterfaceDefSeq & base_interfaces
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -9030,6 +7854,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9047,7 +7872,7 @@
+ }
+ 
+ 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;
+@@ -9062,19 +7887,26 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_InterfaceDefSeq & base_interfaces
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 &);
+@@ -9083,8 +7915,8 @@
+   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 (
+@@ -9093,7 +7925,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_InterfaceDefSeq & base_interfaces
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -9144,6 +7977,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9161,7 +7995,7 @@
+ }
+ 
+ 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;
+@@ -9173,15 +8007,15 @@
+ //                Base & Remote Proxy  Implementation. 
+ //
+ 
+-CORBA::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
++_TAO_CORBA_Container_Proxy_Impl::_TAO_CORBA_Container_Proxy_Impl (void)
+ {}
+ 
+-CORBA::_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 CORBA::_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
+     ACE_ENV_ARG_DECL
+@@ -9191,13 +8025,13 @@
+   ))
+ {
+   
+-  CORBA::Contained_var _tao_retval (CORBA::Contained::_nil ());
+-
++  CORBA_Contained_ptr _tao_retval = CORBA_Contained::_nil ();
++  CORBA_Contained_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -9224,25 +8058,26 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_lookup _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_lookup ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        search_name ACE_ENV_ARG_PARAMETER
++        search_name
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9256,13 +8091,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -9275,7 +8110,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -9288,9 +8123,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -9301,7 +8136,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -9312,13 +8147,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::Contained_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9326,15 +8161,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -9342,11 +8177,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -9356,10 +8191,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ContainedSeq * CORBA::_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
+@@ -9370,24 +8205,21 @@
+   ))
+ {
+   
+-  CORBA::ContainedSeq_var _tao_retval;
++  CORBA_ContainedSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    CORBA::ContainedSeq *tmp;
+-    ACE_NEW_RETURN (tmp, CORBA::ContainedSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+       8,
+-      2,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -9407,26 +8239,27 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_contents _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_contents ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         limit_type,
+-        exclude_inherited ACE_ENV_ARG_PARAMETER
++        exclude_inherited
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9440,13 +8273,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -9460,7 +8293,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -9473,9 +8306,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -9486,7 +8319,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -9497,13 +8330,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9511,15 +8344,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -9527,11 +8360,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -9541,10 +8374,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ContainedSeq * CORBA::_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,
+@@ -9557,24 +8390,21 @@
+   ))
+ {
+   
+-  CORBA::ContainedSeq_var _tao_retval;
++  CORBA_ContainedSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    CORBA::ContainedSeq *tmp;
+-    ACE_NEW_RETURN (tmp, CORBA::ContainedSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+       11,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -9594,28 +8424,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_lookup_name _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_lookup_name ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         search_name,
+         levels_to_search,
+         limit_type,
+-        exclude_inherited ACE_ENV_ARG_PARAMETER
++        exclude_inherited
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9629,13 +8460,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -9651,7 +8482,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -9664,9 +8495,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -9677,7 +8508,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -9688,13 +8519,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9702,15 +8533,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -9718,11 +8549,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -9732,10 +8563,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::Container::DescriptionSeq * CORBA::_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,
+@@ -9747,24 +8578,21 @@
+   ))
+ {
+   
+-  CORBA::Container::DescriptionSeq_var _tao_retval;
++  CORBA_Container::DescriptionSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    CORBA::Container::DescriptionSeq *tmp;
+-    ACE_NEW_RETURN (tmp, CORBA::Container::DescriptionSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+       17,
+-      3,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -9784,27 +8612,28 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_describe_contents _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_describe_contents ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         limit_type,
+         exclude_inherited,
+-        max_returned_objs ACE_ENV_ARG_PARAMETER
++        max_returned_objs
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9818,13 +8647,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -9839,7 +8668,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -9852,9 +8681,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -9865,7 +8694,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -9876,13 +8705,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -9890,15 +8719,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -9906,11 +8735,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -9920,10 +8749,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ModuleDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_module (
++CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+@@ -9935,20 +8764,20 @@
+   ))
+ {
+   
+-  CORBA::ModuleDef_var _tao_retval ( tao_CORBA_ModuleDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_module",
+       13,
+-      3,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -9968,27 +8797,28 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_module _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_module ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+-        version ACE_ENV_ARG_PARAMETER
++        version
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10002,13 +8832,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10023,7 +8853,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10036,9 +8866,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10049,7 +8879,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10060,13 +8890,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10074,15 +8904,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10090,11 +8920,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10104,15 +8934,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ConstantDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_constant (
++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,
++    CORBA_IDLType_ptr type,
+     const CORBA::Any & value
+     ACE_ENV_ARG_DECL
+   )
+@@ -10121,20 +8951,20 @@
+   ))
+ {
+   
+-  CORBA::ConstantDef_var _tao_retval ( tao_CORBA_ConstantDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_constant",
+       15,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -10154,29 +8984,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_constant _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_constant ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         type,
+-        value ACE_ENV_ARG_PARAMETER
++        value
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10190,13 +9021,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10213,7 +9044,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10226,9 +9057,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10239,7 +9070,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10250,13 +9081,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10264,15 +9095,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10280,11 +9111,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10294,15 +9125,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::StructDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_struct (
++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
++    const CORBA_StructMemberSeq & members
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -10310,20 +9141,20 @@
+   ))
+ {
+   
+-  CORBA::StructDef_var _tao_retval ( tao_CORBA_StructDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_struct",
+       13,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -10343,28 +9174,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_struct _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_struct ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        members ACE_ENV_ARG_PARAMETER
++        members
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10378,13 +9210,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10400,7 +9232,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10413,9 +9245,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10426,7 +9258,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10437,13 +9269,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::StructDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10451,15 +9283,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10467,11 +9299,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10481,16 +9313,16 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::UnionDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_union (
++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_IDLType_ptr discriminator_type,
++    const CORBA_UnionMemberSeq & members
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -10498,20 +9330,20 @@
+   ))
+ {
+   
+-  CORBA::UnionDef_var _tao_retval ( tao_CORBA_UnionDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_union",
+       12,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -10531,29 +9363,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_union _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_union ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         discriminator_type,
+-        members ACE_ENV_ARG_PARAMETER
++        members
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10567,13 +9400,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10590,7 +9423,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10603,9 +9436,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10616,7 +9449,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10627,13 +9460,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10641,15 +9474,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10657,11 +9490,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10671,15 +9504,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::EnumDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_enum (
++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
++    const CORBA_EnumMemberSeq & members
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -10687,20 +9520,20 @@
+   ))
+ {
+   
+-  CORBA::EnumDef_var _tao_retval ( tao_CORBA_EnumDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_enum",
+       11,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -10720,28 +9553,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_enum _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_enum ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        members ACE_ENV_ARG_PARAMETER
++        members
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10755,13 +9589,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10777,7 +9611,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10790,9 +9624,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10803,7 +9637,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10814,13 +9648,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10828,15 +9662,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10844,11 +9678,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10858,15 +9692,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::AliasDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_alias (
++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_IDLType_ptr original_type
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -10874,20 +9708,20 @@
+   ))
+ {
+   
+-  CORBA::AliasDef_var _tao_retval ( tao_CORBA_AliasDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_alias",
+       12,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -10907,28 +9741,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_alias _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_alias ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        original_type ACE_ENV_ARG_PARAMETER
++        original_type
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10942,13 +9777,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -10964,7 +9799,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10977,9 +9812,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10990,7 +9825,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11001,13 +9836,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11015,15 +9850,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11031,11 +9866,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11045,15 +9880,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::InterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_interface (
++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
++    const CORBA_InterfaceDefSeq & base_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -11061,20 +9896,20 @@
+   ))
+ {
+   
+-  CORBA::InterfaceDef_var _tao_retval ( tao_CORBA_InterfaceDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_interface",
+       16,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11094,28 +9929,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_interface _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_interface ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        base_interfaces ACE_ENV_ARG_PARAMETER
++        base_interfaces
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11129,13 +9965,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11151,7 +9987,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11164,9 +10000,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11177,7 +10013,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11188,13 +10024,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11202,15 +10038,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11218,11 +10054,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11232,21 +10068,21 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ValueDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_value (
++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_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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -11254,20 +10090,20 @@
+   ))
+ {
+   
+-  CORBA::ValueDef_var _tao_retval ( tao_CORBA_ValueDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_value",
+       12,
+-      10,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11287,7 +10123,7 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_value _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_value ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+@@ -11299,22 +10135,23 @@
+         is_truncatable,
+         abstract_base_values,
+         supported_interfaces,
+-        initializers ACE_ENV_ARG_PARAMETER
++        initializers
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11328,13 +10165,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11356,7 +10193,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11369,9 +10206,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11382,7 +10219,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11393,13 +10230,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11407,15 +10244,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11423,11 +10260,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11437,15 +10274,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ValueBoxDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_value_box (
++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_IDLType_ptr original_type_def
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -11453,20 +10290,20 @@
+   ))
+ {
+   
+-  CORBA::ValueBoxDef_var _tao_retval ( tao_CORBA_ValueBoxDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_value_box",
+       16,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11486,28 +10323,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_value_box _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_value_box ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        original_type_def ACE_ENV_ARG_PARAMETER
++        original_type_def
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11521,13 +10359,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11543,7 +10381,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11556,9 +10394,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11569,7 +10407,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11580,13 +10418,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11594,15 +10432,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11610,11 +10448,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11624,15 +10462,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::ExceptionDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_exception (
++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
++    const CORBA_StructMemberSeq & members
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -11640,20 +10478,20 @@
+   ))
+ {
+   
+-  CORBA::ExceptionDef_var _tao_retval ( tao_CORBA_ExceptionDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_exception",
+       16,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11673,28 +10511,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_exception _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_exception ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        members ACE_ENV_ARG_PARAMETER
++        members
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11708,13 +10547,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11730,7 +10569,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11743,9 +10582,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11756,7 +10595,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11767,13 +10606,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11781,15 +10620,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11797,11 +10636,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11811,10 +10650,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::NativeDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_native (
++CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+@@ -11826,20 +10665,20 @@
+   ))
+ {
+   
+-  CORBA::NativeDef_var _tao_retval ( tao_CORBA_NativeDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_native",
+       13,
+-      3,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11859,27 +10698,28 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_native _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_native ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+-        version ACE_ENV_ARG_PARAMETER
++        version
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11893,13 +10733,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11914,7 +10754,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11927,9 +10767,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11940,7 +10780,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11951,13 +10791,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11965,15 +10805,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11981,11 +10821,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11995,15 +10835,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::AbstractInterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_abstract_interface (
++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
++    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -12011,20 +10851,20 @@
+   ))
+ {
+   
+-  CORBA::AbstractInterfaceDef_var _tao_retval ( tao_CORBA_AbstractInterfaceDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_abstract_interface",
+       25,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12044,28 +10884,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        base_interfaces ACE_ENV_ARG_PARAMETER
++        base_interfaces
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12079,13 +10920,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12101,7 +10942,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12114,9 +10955,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12127,7 +10968,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12138,13 +10979,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::AbstractInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12152,15 +10993,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12168,11 +11009,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12182,15 +11023,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::CORBA::LocalInterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_local_interface (
++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
++    const CORBA_InterfaceDefSeq & base_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -12198,20 +11039,20 @@
+   ))
+ {
+   
+-  CORBA::LocalInterfaceDef_var _tao_retval ( tao_CORBA_LocalInterfaceDef_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_local_interface",
+       22,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12231,28 +11072,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_Container_create_local_interface _tao_ri (
++      TAO_ClientRequestInfo_CORBA_Container_create_local_interface ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        base_interfaces ACE_ENV_ARG_PARAMETER
++        base_interfaces
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12266,13 +11108,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12288,7 +11130,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12301,9 +11143,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12314,7 +11156,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12325,13 +11167,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::LocalInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12339,15 +11181,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12355,11 +11197,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12369,7 +11211,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -12382,37 +11224,37 @@
+ //           Remote & Base  Proxy Broker Implementation
+ //
+ 
+-CORBA::_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
++_TAO_CORBA_Container_Proxy_Broker::_TAO_CORBA_Container_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
++_TAO_CORBA_Container_Proxy_Broker::~_TAO_CORBA_Container_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_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.
+-CORBA::_TAO_Container_Remote_Proxy_Broker *
+-CORBA::_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 ::CORBA::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
++  static ::_TAO_CORBA_Container_Remote_Proxy_Broker remote_proxy_broker;
+   return &remote_proxy_broker;
+ }
+ 
+-CORBA::_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
++_TAO_CORBA_Container_Remote_Proxy_Broker::_TAO_CORBA_Container_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
++_TAO_CORBA_Container_Remote_Proxy_Broker::~_TAO_CORBA_Container_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_Container_Proxy_Impl&
+-CORBA::_TAO_Container_Remote_Proxy_Broker::select_proxy (
+-  ::CORBA::Container *
++_TAO_CORBA_Container_Proxy_Impl&
++_TAO_CORBA_Container_Remote_Proxy_Broker::select_proxy (
++  ::CORBA_Container *
+   ACE_ENV_ARG_DECL_NOT_USED
+ )
+ {
+@@ -12425,126 +11267,110 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
+-CORBA::Container::Container (int collocated)
++// default constructor
++CORBA_Container::CORBA_Container (int collocated)
+ {
+   this->CORBA_Container_setup_collocation (collocated);
+ }
+ 
+-CORBA::Container::~Container (void)
++// destructor
++CORBA_Container::~CORBA_Container (void)
+ {}
+ 
+ void
+-CORBA::Container::CORBA_Container_setup_collocation (int collocated)
++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_ =
+-      ::CORBA::_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 *_tao_void_pointer)
++void CORBA_Container::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  Container *tmp = ACE_static_cast (Container*, _tao_void_pointer);
++  CORBA_Container *tmp = ACE_static_cast (CORBA_Container*, _tao_void_pointer);
+   CORBA::release (tmp);
+ }
+ 
+-CORBA::Container_ptr CORBA::Container::_narrow (
++CORBA_Container_ptr CORBA_Container::_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return 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);
-+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0", ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_Container::_nil ());
+       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" ACE_ENV_ARG_PARAMETER);
+-      ACE_CHECK_RETURN (Container::_nil ());
++      ACE_CHECK_RETURN (CORBA_Container::_nil ());
        if (is_a == 0)
-         return CORBA_Container::_nil ();
-@@ -12477,8 +11331,8 @@
- CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-        return Container::_nil ();
++        return CORBA_Container::_nil ();
+     }
+-  return Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
++  return CORBA_Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-CORBA::Container_ptr 
+-CORBA::Container::_unchecked_narrow (
++CORBA_Container_ptr CORBA_Container::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return Container::_nil ();
++    return CORBA_Container::_nil ();
+   if (! obj->_is_local ())
+     {
+       TAO_Stub* stub = obj->_stubobj ();
+       if (stub)
+         stub->_incr_refcnt ();
+-      Container_ptr default_proxy = 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 ()
+-                ),
+-              Container::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::CORBA::Container (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              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 ());
+       return default_proxy;
+     }
+   else 
+     return
+       ACE_reinterpret_cast
+         (
+-          Container_ptr,
++            CORBA_Container_ptr,
+             obj->_tao_QueryInterface
+               (
+                 ACE_reinterpret_cast
+                   (
+                     ptr_arith_t,
+-                    &Container::_tao_class_id
++                      &CORBA_Container::_tao_class_id
+                   )
+               )
+         );
+ }
+ 
+-CORBA::Container_ptr
+-CORBA::Container::_duplicate (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 ACE_ENV_ARG_DECL)
++CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
  {
    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
-@@ -12515,7 +11369,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 (
-@@ -12591,13 +11445,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), 
-@@ -12610,22 +11464,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), 
-@@ -12892,37 +11745,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), 
-@@ -12935,22 +11788,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), 
-@@ -13470,36 +12322,6 @@
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+@@ -12555,22 +11381,22 @@
+     return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-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,
+-      &ACE_NESTED_CLASS (::CORBA, Container)::_tao_class_id))
++      &CORBA_Container::_tao_class_id))
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -12583,12 +11409,12 @@
+   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
+     ACE_ENV_ARG_DECL
+   )
+@@ -12596,17 +11422,18 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.lookup (
+       this,
+-      search_name ACE_ENV_ARG_PARAMETER
++      search_name
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::ContainedSeq * CORBA::Container::contents (
++CORBA_ContainedSeq * CORBA_Container::contents (
+     CORBA::DefinitionKind limit_type,
+     CORBA::Boolean exclude_inherited
+     ACE_ENV_ARG_DECL
+@@ -12615,18 +11442,19 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.contents (
+       this,
+       limit_type,
+-      exclude_inherited ACE_ENV_ARG_PARAMETER
++      exclude_inherited
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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,
+@@ -12637,8 +11465,8 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.lookup_name (
+@@ -12646,7 +11474,8 @@
+       search_name,
+       levels_to_search,
+       limit_type,
+-      exclude_inherited ACE_ENV_ARG_PARAMETER
++      exclude_inherited
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -12842,13 +11671,13 @@
+     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 *_tao_void_pointer)
++void CORBA_Container::Description::_tao_any_destructor (void *_tao_void_pointer)
+ {
+   Description *tmp = ACE_static_cast (Description*, _tao_void_pointer);
+   delete tmp;
+@@ -12861,14 +11690,14 @@
+ #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];
+@@ -12881,18 +11710,18 @@
+ }
+ 
+ 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 ();
+ }
+@@ -12907,41 +11736,41 @@
+ #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 *_tao_void_pointer)
++void CORBA_Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
+ {
+   DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*, _tao_void_pointer);
+   delete tmp;
+@@ -13169,13 +11998,13 @@
+     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
+@@ -13185,19 +12014,20 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.describe_contents (
+       this,
+       limit_type,
+       exclude_inherited,
+-      max_returned_objs ACE_ENV_ARG_PARAMETER
++      max_returned_objs
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::ModuleDef_ptr CORBA::Container::create_module (
++CORBA_ModuleDef_ptr CORBA_Container::create_module (
+     const char * id,
+     const char * name,
+     const char * version
+@@ -13207,23 +12037,24 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_module (
+       this,
+       id,
+       name,
+-      version ACE_ENV_ARG_PARAMETER
++      version
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+@@ -13231,8 +12062,8 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_constant (
+@@ -13241,23 +12072,24 @@
+       name,
+       version,
+       type,
+-      value ACE_ENV_ARG_PARAMETER
++      value
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_struct (
+@@ -13265,24 +12097,25 @@
+       id,
+       name,
+       version,
+-      members ACE_ENV_ARG_PARAMETER
++      members
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_union (
+@@ -13291,23 +12124,24 @@
+       name,
+       version,
+       discriminator_type,
+-      members ACE_ENV_ARG_PARAMETER
++      members
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_enum (
+@@ -13315,23 +12149,24 @@
+       id,
+       name,
+       version,
+-      members ACE_ENV_ARG_PARAMETER
++      members
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_alias (
+@@ -13339,23 +12174,24 @@
+       id,
+       name,
+       version,
+-      original_type ACE_ENV_ARG_PARAMETER
++      original_type
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_interface (
+@@ -13363,29 +12199,30 @@
+       id,
+       name,
+       version,
+-      base_interfaces ACE_ENV_ARG_PARAMETER
++      base_interfaces
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_value (
+@@ -13399,23 +12236,24 @@
+       is_truncatable,
+       abstract_base_values,
+       supported_interfaces,
+-      initializers ACE_ENV_ARG_PARAMETER
++      initializers
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_value_box (
+@@ -13423,23 +12261,24 @@
+       id,
+       name,
+       version,
+-      original_type_def ACE_ENV_ARG_PARAMETER
++      original_type_def
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_exception (
+@@ -13447,11 +12286,12 @@
+       id,
+       name,
+       version,
+-      members ACE_ENV_ARG_PARAMETER
++      members
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::NativeDef_ptr CORBA::Container::create_native (
++CORBA_NativeDef_ptr CORBA_Container::create_native (
+     const char * id,
+     const char * name,
+     const char * version
+@@ -13461,31 +12301,32 @@
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_native (
+       this,
+       id,
+       name,
+-      version ACE_ENV_ARG_PARAMETER
++      version
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_abstract_interface (
+@@ -13493,23 +12334,24 @@
+       id,
+       name,
+       version,
+-      base_interfaces ACE_ENV_ARG_PARAMETER
++      base_interfaces
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_Container_Proxy_Impl &proxy = 
+-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_Container_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.create_local_interface (
+@@ -13517,78 +12359,42 @@
+       id,
+       name,
+       version,
+-      base_interfaces ACE_ENV_ARG_PARAMETER
++      base_interfaces
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
@@ -1490,15 +11718,14 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x412f436f), 
 -  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
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
+-  10,
+-  ACE_NTOHL (0x436f6e74), 
+-  ACE_NTOHL (0x61696e65), 
+-  ACE_NTOHL (0x72000000),  // name = Container
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (
@@ -1506,45 +11733,808 @@
 -    sizeof (_oc_CORBA_Container),
 -    (char *) &_oc_CORBA_Container,
 -    0,
--    sizeof (CORBA_Container)
+-    sizeof (CORBA::Container)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_Container =
--  &_tc_TAO_tc_CORBA_Container;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_CORBA_Container)
+-TAO_NAMESPACE_END
+-
 -
- CORBA_IDLType_ptr
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int CORBA::IDLType::_tao_class_id = 0;
+-
+-CORBA::IDLType_ptr
++CORBA_IDLType_ptr
  tao_CORBA_IDLType_duplicate (
-     CORBA_IDLType_ptr p
-@@ -14085,7 +12907,7 @@
-     return CORBA_IDLType::_nil ();
+-    CORBA::IDLType_ptr p
++    CORBA_IDLType_ptr p
+   )
+ {
+-  return CORBA::IDLType::_duplicate (p);
++  return CORBA_IDLType::_duplicate (p);
+ }
+ 
+ void
+ tao_CORBA_IDLType_release (
+-    CORBA::IDLType_ptr p
++    CORBA_IDLType_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-CORBA::IDLType_ptr
++CORBA_IDLType_ptr
+ tao_CORBA_IDLType_nil (
+     void
+   )
+ {
+-  return CORBA::IDLType::_nil ();
++  return CORBA_IDLType::_nil ();
+ }
+ 
+-CORBA::IDLType_ptr
++CORBA_IDLType_ptr
+ tao_CORBA_IDLType_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return CORBA::IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+@@ -13596,193 +12402,191 @@
+     void *src
+   )
+ {
+-  CORBA::IDLType **tmp =
+-    ACE_static_cast (CORBA::IDLType **, src);
++  CORBA_IDLType **tmp =
++    ACE_static_cast (CORBA_IDLType **, src);
+   return *tmp;
+ }
+ 
++int CORBA_IDLType::_tao_class_id = 0;
++
+ // *************************************************************
+-// CORBA::IDLType_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class CORBA_IDLType_var
+ // *************************************************************
+ 
+-CORBA::IDLType_var::IDLType_var (void) // default constructor
+-  : ptr_ (IDLType::_nil ())
++CORBA_IDLType_var::CORBA_IDLType_var (void) // default constructor
++  : ptr_ (CORBA_IDLType::_nil ())
+ {}
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::ptr (void) const
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::ptr (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::IDLType_var::IDLType_var (const ::CORBA::IDLType_var &p) // copy constructor
++CORBA_IDLType_var::CORBA_IDLType_var (const ::CORBA_IDLType_var &p) // copy constructor
+   : TAO_Base_var (),
+-    ptr_ (IDLType::_duplicate (p.ptr ()))
++    ptr_ (CORBA_IDLType::_duplicate (p.ptr ()))
+ {}
+ 
+-CORBA::IDLType_var::~IDLType_var (void) // destructor
++CORBA_IDLType_var::~CORBA_IDLType_var (void) // destructor
+ {
+   CORBA::release (this->ptr_);
+ }
+ 
+-CORBA::IDLType_var &
+-CORBA::IDLType_var::operator= (IDLType_ptr p)
++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)
++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 ());
++    this->ptr_ = ::CORBA_IDLType::_duplicate (p.ptr ());
+   }
+   return *this;
+ }
+ 
+-CORBA::IDLType_var::operator const ::CORBA::IDLType_ptr &() const // cast
++CORBA_IDLType_var::operator const ::CORBA_IDLType_ptr &() const // cast
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::IDLType_var::operator ::CORBA::IDLType_ptr &() // cast 
++CORBA_IDLType_var::operator ::CORBA_IDLType_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::operator-> (void) const
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::operator-> (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::in (void) const
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::in (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr &
+-CORBA::IDLType_var::inout (void)
++::CORBA_IDLType_ptr &
++CORBA_IDLType_var::inout (void)
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr &
+-CORBA::IDLType_var::out (void)
++::CORBA_IDLType_ptr &
++CORBA_IDLType_var::out (void)
+ {
+   CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA::IDLType::_nil ();
++  this->ptr_ = ::CORBA_IDLType::_nil ();
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::_retn (void)
++::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 ();
++  ::CORBA_IDLType_ptr val = this->ptr_;
++  this->ptr_ = ::CORBA_IDLType::_nil ();
+   return val;
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::tao_duplicate (IDLType_ptr p)
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::tao_duplicate (CORBA_IDLType_ptr p)
+ {
+-  return ::CORBA::IDLType::_duplicate (p);
++  return ::CORBA_IDLType::_duplicate (p);
+ }
+ 
+ void
+-CORBA::IDLType_var::tao_release (IDLType_ptr p)
++CORBA_IDLType_var::tao_release (CORBA_IDLType_ptr p)
+ {
+   CORBA::release (p);
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::tao_nil (void)
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::tao_nil (void)
+ {
+-  return ::CORBA::IDLType::_nil ();
++  return ::CORBA_IDLType::_nil ();
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_var::tao_narrow (
++::CORBA_IDLType_ptr
++CORBA_IDLType_var::tao_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return ::CORBA::IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return ::CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+-CORBA::IDLType_var::tao_upcast (void *src)
++CORBA_IDLType_var::tao_upcast (void *src)
+ {
+-  IDLType **tmp =
+-    ACE_static_cast (IDLType **, src);
++  CORBA_IDLType **tmp =
++    ACE_static_cast (CORBA_IDLType **, src);
+   return *tmp;
+ }
+ 
+ // *************************************************************
+-// CORBA::IDLType_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class CORBA_IDLType_out
+ // *************************************************************
+ 
+-CORBA::IDLType_out::IDLType_out (IDLType_ptr &p)
++CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_ptr &p)
+   : ptr_ (p)
+ {
+-  this->ptr_ = ::CORBA::IDLType::_nil ();
++  this->ptr_ = ::CORBA_IDLType::_nil ();
+ }
+ 
+-CORBA::IDLType_out::IDLType_out (IDLType_var &p) // constructor from _var
++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 ();
++  this->ptr_ = ::CORBA_IDLType::_nil ();
+ }
+ 
+-CORBA::IDLType_out::IDLType_out (const ::CORBA::IDLType_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (IDLType_out &, p).ptr_)
++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)
++::CORBA_IDLType_out &
++CORBA_IDLType_out::operator= (const ::CORBA_IDLType_out &p)
+ {
+-  this->ptr_ = ACE_const_cast (IDLType_out&, p).ptr_;
++  this->ptr_ = ACE_const_cast (CORBA_IDLType_out&, p).ptr_;
+   return *this;
+ }
+ 
+-CORBA::IDLType_out &
+-CORBA::IDLType_out::operator= (const ::CORBA::IDLType_var &p)
++CORBA_IDLType_out &
++CORBA_IDLType_out::operator= (const ::CORBA_IDLType_var &p)
+ {
+-  this->ptr_ = ::CORBA::IDLType::_duplicate (p.ptr ());
++  this->ptr_ = ::CORBA_IDLType::_duplicate (p.ptr ());
+   return *this;
+ }
+ 
+-CORBA::IDLType_out &
+-CORBA::IDLType_out::operator= (IDLType_ptr p)
++CORBA_IDLType_out &
++CORBA_IDLType_out::operator= (CORBA_IDLType_ptr p)
+ {
+   this->ptr_ = p;
+   return *this;
+ }
+ 
+-CORBA::IDLType_out::operator ::CORBA::IDLType_ptr &() // cast
++CORBA_IDLType_out::operator ::CORBA_IDLType_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr &
+-CORBA::IDLType_out::ptr (void) // ptr
++::CORBA_IDLType_ptr &
++CORBA_IDLType_out::ptr (void) // ptr
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::IDLType_ptr
+-CORBA::IDLType_out::operator-> (void)
++::CORBA_IDLType_ptr
++CORBA_IDLType_out::operator-> (void)
+ {
+   return this->ptr_;
+ }
+@@ -13794,16 +12598,23 @@
+ public:
+   TAO_ClientRequestInfo_CORBA_IDLType_type_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::TypeCode_ptr result);
+@@ -13817,7 +12628,8 @@
+ 
+ TAO_ClientRequestInfo_CORBA_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -13832,7 +12644,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -13847,6 +12658,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -13876,15 +12688,15 @@
+ //                Base & Remote Proxy  Implementation. 
+ //
+ 
+-CORBA::_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
++_TAO_CORBA_IDLType_Proxy_Impl::_TAO_CORBA_IDLType_Proxy_Impl (void)
+ {}
+ 
+-CORBA::_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 CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
++CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -13893,12 +12705,13 @@
+   ))
+ {
+   
+-  CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -13925,24 +12738,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_CORBA_IDLType_type_get _tao_ri (
++      TAO_ClientRequestInfo_CORBA_IDLType_type_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -13956,17 +12770,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -13979,9 +12793,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -13992,7 +12806,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -14003,13 +12817,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -14017,15 +12831,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -14033,11 +12847,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -14047,7 +12861,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -14060,37 +12874,37 @@
+ //           Remote & Base  Proxy Broker Implementation
+ //
+ 
+-CORBA::_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
++_TAO_CORBA_IDLType_Proxy_Broker::_TAO_CORBA_IDLType_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
++_TAO_CORBA_IDLType_Proxy_Broker::~_TAO_CORBA_IDLType_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_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.
+-CORBA::_TAO_IDLType_Remote_Proxy_Broker *
+-CORBA::_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 ::CORBA::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
++  static ::_TAO_CORBA_IDLType_Remote_Proxy_Broker remote_proxy_broker;
+   return &remote_proxy_broker;
+ }
+ 
+-CORBA::_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
++_TAO_CORBA_IDLType_Remote_Proxy_Broker::_TAO_CORBA_IDLType_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
++_TAO_CORBA_IDLType_Remote_Proxy_Broker::~_TAO_CORBA_IDLType_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_IDLType_Proxy_Impl&
+-CORBA::_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
+-  ::CORBA::IDLType *
++_TAO_CORBA_IDLType_Proxy_Impl&
++_TAO_CORBA_IDLType_Remote_Proxy_Broker::select_proxy (
++  ::CORBA_IDLType *
+   ACE_ENV_ARG_DECL_NOT_USED
+ )
+ {
+@@ -14103,126 +12917,110 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
+-CORBA::IDLType::IDLType (int collocated)
++// default constructor
++CORBA_IDLType::CORBA_IDLType (int collocated)
+ {
+   this->CORBA_IDLType_setup_collocation (collocated);
+ }
+ 
+-CORBA::IDLType::~IDLType (void)
++// destructor
++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_ =
+-      ::CORBA::_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 *_tao_void_pointer)
++void CORBA_IDLType::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  IDLType *tmp = ACE_static_cast (IDLType*, _tao_void_pointer);
++  CORBA_IDLType *tmp = ACE_static_cast (CORBA_IDLType*, _tao_void_pointer);
+   CORBA::release (tmp);
+ }
+ 
+-CORBA::IDLType_ptr CORBA::IDLType::_narrow (
++CORBA_IDLType_ptr CORBA_IDLType::_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return 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);
-+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0", ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
+       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" ACE_ENV_ARG_PARAMETER);
+-      ACE_CHECK_RETURN (IDLType::_nil ());
++      ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
        if (is_a == 0)
-         return CORBA_IDLType::_nil ();
-@@ -14153,8 +12975,8 @@
- CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-        return IDLType::_nil ();
++        return CORBA_IDLType::_nil ();
+     }
+-  return IDLType::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
++  return CORBA_IDLType::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-CORBA::IDLType_ptr 
+-CORBA::IDLType::_unchecked_narrow (
++CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return IDLType::_nil ();
++    return CORBA_IDLType::_nil ();
+   if (! obj->_is_local ())
+     {
+       TAO_Stub* stub = obj->_stubobj ();
+       if (stub)
+         stub->_incr_refcnt ();
+-      IDLType_ptr default_proxy = 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 ()
+-                ),
+-              IDLType::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::CORBA::IDLType (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              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 ());
+       return default_proxy;
+     }
+   else 
+     return
+       ACE_reinterpret_cast
+         (
+-          IDLType_ptr,
++            CORBA_IDLType_ptr,
+             obj->_tao_QueryInterface
+               (
+                 ACE_reinterpret_cast
+                   (
+                     ptr_arith_t,
+-                    &IDLType::_tao_class_id
++                      &CORBA_IDLType::_tao_class_id
+                   )
+               )
+         );
+ }
+ 
+-CORBA::IDLType_ptr
+-CORBA::IDLType::_duplicate (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 ACE_ENV_ARG_DECL)
++CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
  {
    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
-@@ -14191,7 +13013,7 @@
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+@@ -14233,22 +13031,22 @@
+     return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+ }
  
- const char* CORBA_IDLType::_interface_repository_id (void) const
+-void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type)
++void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type)
  {
--  return "IDL:omg.org/CORBA_IDLType:1.0";
-+  return "IDL:omg.org/CORBA/IDLType:1.0";
+   void *retv = 0;
+   if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IDLType)::_tao_class_id))
++      &CORBA_IDLType::_tao_class_id))
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -14261,95 +13059,59 @@
+   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 (
-@@ -14211,36 +13033,6 @@
+-CORBA::TypeCode_ptr CORBA::IDLType::type (
+-    
++CORBA::TypeCode_ptr CORBA_IDLType::type (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+     CORBA::SystemException
+   ))
+ {
+-  _TAO_IDLType_Proxy_Impl &proxy = 
+-    this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
++  _TAO_CORBA_IDLType_Proxy_Impl &proxy =
++    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.type (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
@@ -1556,15 +12546,13 @@
 -  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
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (
@@ -1572,45 +12560,605 @@
 -    sizeof (_oc_CORBA_IDLType),
 -    (char *) &_oc_CORBA_IDLType,
 -    0,
--    sizeof (CORBA_IDLType)
+-    sizeof (CORBA::IDLType)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_IDLType =
--  &_tc_TAO_tc_CORBA_IDLType;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDLType, &_tc_TAO_tc_CORBA_IDLType)
+-TAO_NAMESPACE_END
 -
- CORBA_TypedefDef_ptr
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int CORBA::TypedefDef::_tao_class_id = 0;
+-
+-CORBA::TypedefDef_ptr
++CORBA_TypedefDef_ptr
  tao_CORBA_TypedefDef_duplicate (
-     CORBA_TypedefDef_ptr p
-@@ -14575,7 +13367,7 @@
-     return CORBA_TypedefDef::_nil ();
+-    CORBA::TypedefDef_ptr p
++    CORBA_TypedefDef_ptr p
+   )
+ {
+-  return CORBA::TypedefDef::_duplicate (p);
++  return CORBA_TypedefDef::_duplicate (p);
+ }
+ 
+ void
+ tao_CORBA_TypedefDef_release (
+-    CORBA::TypedefDef_ptr p
++    CORBA_TypedefDef_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-CORBA::TypedefDef_ptr
++CORBA_TypedefDef_ptr
+ tao_CORBA_TypedefDef_nil (
+     void
+   )
+ {
+-  return CORBA::TypedefDef::_nil ();
++  return CORBA_TypedefDef::_nil ();
+ }
+ 
+-CORBA::TypedefDef_ptr
++CORBA_TypedefDef_ptr
+ tao_CORBA_TypedefDef_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return CORBA::TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+@@ -14357,193 +13119,191 @@
+     void *src
+   )
+ {
+-  CORBA::TypedefDef **tmp =
+-    ACE_static_cast (CORBA::TypedefDef **, src);
++  CORBA_TypedefDef **tmp =
++    ACE_static_cast (CORBA_TypedefDef **, src);
+   return *tmp;
+ }
+ 
++int CORBA_TypedefDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// CORBA::TypedefDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class CORBA_TypedefDef_var
+ // *************************************************************
+ 
+-CORBA::TypedefDef_var::TypedefDef_var (void) // default constructor
+-  : ptr_ (TypedefDef::_nil ())
++CORBA_TypedefDef_var::CORBA_TypedefDef_var (void) // default constructor
++  : ptr_ (CORBA_TypedefDef::_nil ())
+ {}
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::ptr (void) const
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::ptr (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::TypedefDef_var::TypedefDef_var (const ::CORBA::TypedefDef_var &p) // copy constructor
++CORBA_TypedefDef_var::CORBA_TypedefDef_var (const ::CORBA_TypedefDef_var &p) // copy constructor
+   : TAO_Base_var (),
+-    ptr_ (TypedefDef::_duplicate (p.ptr ()))
++    ptr_ (CORBA_TypedefDef::_duplicate (p.ptr ()))
+ {}
+ 
+-CORBA::TypedefDef_var::~TypedefDef_var (void) // destructor
++CORBA_TypedefDef_var::~CORBA_TypedefDef_var (void) // destructor
+ {
+   CORBA::release (this->ptr_);
+ }
+ 
+-CORBA::TypedefDef_var &
+-CORBA::TypedefDef_var::operator= (TypedefDef_ptr p)
++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)
++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 ());
++    this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
+   }
+   return *this;
+ }
+ 
+-CORBA::TypedefDef_var::operator const ::CORBA::TypedefDef_ptr &() const // cast
++CORBA_TypedefDef_var::operator const ::CORBA_TypedefDef_ptr &() const // cast
+ {
+   return this->ptr_;
+ }
+ 
+-CORBA::TypedefDef_var::operator ::CORBA::TypedefDef_ptr &() // cast 
++CORBA_TypedefDef_var::operator ::CORBA_TypedefDef_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::operator-> (void) const
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::operator-> (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::in (void) const
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::in (void) const
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr &
+-CORBA::TypedefDef_var::inout (void)
++::CORBA_TypedefDef_ptr &
++CORBA_TypedefDef_var::inout (void)
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr &
+-CORBA::TypedefDef_var::out (void)
++::CORBA_TypedefDef_ptr &
++CORBA_TypedefDef_var::out (void)
+ {
+   CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
++  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::_retn (void)
++::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 ();
++  ::CORBA_TypedefDef_ptr val = this->ptr_;
++  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+   return val;
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::tao_duplicate (TypedefDef_ptr p)
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::tao_duplicate (CORBA_TypedefDef_ptr p)
+ {
+-  return ::CORBA::TypedefDef::_duplicate (p);
++  return ::CORBA_TypedefDef::_duplicate (p);
+ }
+ 
+ void
+-CORBA::TypedefDef_var::tao_release (TypedefDef_ptr p)
++CORBA_TypedefDef_var::tao_release (CORBA_TypedefDef_ptr p)
+ {
+   CORBA::release (p);
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::tao_nil (void)
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::tao_nil (void)
+ {
+-  return ::CORBA::TypedefDef::_nil ();
++  return ::CORBA_TypedefDef::_nil ();
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_var::tao_narrow (
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_var::tao_narrow (
+     CORBA::Object *p
+     ACE_ENV_ARG_DECL
+   )
+ {
+-  return ::CORBA::TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
++  return ::CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+ }
+ 
+ CORBA::Object *
+-CORBA::TypedefDef_var::tao_upcast (void *src)
++CORBA_TypedefDef_var::tao_upcast (void *src)
+ {
+-  TypedefDef **tmp =
+-    ACE_static_cast (TypedefDef **, src);
++  CORBA_TypedefDef **tmp =
++    ACE_static_cast (CORBA_TypedefDef **, src);
+   return *tmp;
+ }
+ 
+ // *************************************************************
+-// CORBA::TypedefDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class CORBA_TypedefDef_out
+ // *************************************************************
+ 
+-CORBA::TypedefDef_out::TypedefDef_out (TypedefDef_ptr &p)
++CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &p)
+   : ptr_ (p)
+ {
+-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
++  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+ }
+ 
+-CORBA::TypedefDef_out::TypedefDef_out (TypedefDef_var &p) // constructor from _var
++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 ();
++  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+ }
+ 
+-CORBA::TypedefDef_out::TypedefDef_out (const ::CORBA::TypedefDef_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (TypedefDef_out &, p).ptr_)
++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)
++::CORBA_TypedefDef_out &
++CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_out &p)
+ {
+-  this->ptr_ = ACE_const_cast (TypedefDef_out&, p).ptr_;
++  this->ptr_ = ACE_const_cast (CORBA_TypedefDef_out&, p).ptr_;
+   return *this;
+ }
+ 
+-CORBA::TypedefDef_out &
+-CORBA::TypedefDef_out::operator= (const ::CORBA::TypedefDef_var &p)
++CORBA_TypedefDef_out &
++CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_var &p)
+ {
+-  this->ptr_ = ::CORBA::TypedefDef::_duplicate (p.ptr ());
++  this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
+   return *this;
+ }
+ 
+-CORBA::TypedefDef_out &
+-CORBA::TypedefDef_out::operator= (TypedefDef_ptr p)
++CORBA_TypedefDef_out &
++CORBA_TypedefDef_out::operator= (CORBA_TypedefDef_ptr p)
+ {
+   this->ptr_ = p;
+   return *this;
+ }
+ 
+-CORBA::TypedefDef_out::operator ::CORBA::TypedefDef_ptr &() // cast
++CORBA_TypedefDef_out::operator ::CORBA_TypedefDef_ptr &() // cast
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr &
+-CORBA::TypedefDef_out::ptr (void) // ptr
++::CORBA_TypedefDef_ptr &
++CORBA_TypedefDef_out::ptr (void) // ptr
+ {
+   return this->ptr_;
+ }
+ 
+-::CORBA::TypedefDef_ptr
+-CORBA::TypedefDef_out::operator-> (void)
++::CORBA_TypedefDef_ptr
++CORBA_TypedefDef_out::operator-> (void)
+ {
+   return this->ptr_;
+ }
+@@ -14556,10 +13316,10 @@
+ //                Base & Remote Proxy  Implementation. 
+ //
+ 
+-CORBA::_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
++_TAO_CORBA_TypedefDef_Proxy_Impl::_TAO_CORBA_TypedefDef_Proxy_Impl (void)
+ {}
+ 
+-CORBA::_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
+@@ -14574,37 +13334,37 @@
+ //           Remote & Base  Proxy Broker Implementation
+ //
+ 
+-CORBA::_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
++_TAO_CORBA_TypedefDef_Proxy_Broker::_TAO_CORBA_TypedefDef_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
++_TAO_CORBA_TypedefDef_Proxy_Broker::~_TAO_CORBA_TypedefDef_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_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.
+-CORBA::_TAO_TypedefDef_Remote_Proxy_Broker *
+-CORBA::_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 ::CORBA::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
++  static ::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
+   return &remote_proxy_broker;
+ }
+ 
+-CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
++_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
++_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::~_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void)
+ {
+ }
+ 
+-CORBA::_TAO_TypedefDef_Proxy_Impl&
+-CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
+-  ::CORBA::TypedefDef *
++_TAO_CORBA_TypedefDef_Proxy_Impl&
++_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::select_proxy (
++  ::CORBA_TypedefDef *
+   ACE_ENV_ARG_DECL_NOT_USED
+ )
+ {
+@@ -14617,128 +13377,112 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
+-CORBA::TypedefDef::TypedefDef (int collocated)
++// default constructor
++CORBA_TypedefDef::CORBA_TypedefDef (int collocated)
+ {
+   this->CORBA_TypedefDef_setup_collocation (collocated);
+ }
+ 
+-CORBA::TypedefDef::~TypedefDef (void)
++// destructor
++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_ =
+-      ::CORBA::_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 *_tao_void_pointer)
++void CORBA_TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
+ {
+-  TypedefDef *tmp = ACE_static_cast (TypedefDef*, _tao_void_pointer);
++  CORBA_TypedefDef *tmp = ACE_static_cast (CORBA_TypedefDef*, _tao_void_pointer);
+   CORBA::release (tmp);
+ }
+ 
+-CORBA::TypedefDef_ptr CORBA::TypedefDef::_narrow (
++CORBA_TypedefDef_ptr CORBA_TypedefDef::_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return 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);
-+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0", ACE_TRY_ENV);
-       ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
+       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" ACE_ENV_ARG_PARAMETER);
+-      ACE_CHECK_RETURN (TypedefDef::_nil ());
++      ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
        if (is_a == 0)
-         return CORBA_TypedefDef::_nil ();
-@@ -14643,10 +13435,10 @@
- CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-        return TypedefDef::_nil ();
++        return CORBA_TypedefDef::_nil ();
+     }
+-  return TypedefDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
++  return CORBA_TypedefDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-CORBA::TypedefDef_ptr 
+-CORBA::TypedefDef::_unchecked_narrow (
++CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+ {
+   if (CORBA::is_nil (obj))
+-    return TypedefDef::_nil ();
++    return CORBA_TypedefDef::_nil ();
+   if (! obj->_is_local ())
+     {
+       TAO_Stub* stub = obj->_stubobj ();
+       if (stub)
+         stub->_incr_refcnt ();
+-      TypedefDef_ptr default_proxy = 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 ()
+-                ),
+-              TypedefDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::CORBA::TypedefDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              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 ());
+       return default_proxy;
+     }
+   else 
+     return
+       ACE_reinterpret_cast
+         (
+-          TypedefDef_ptr,
++            CORBA_TypedefDef_ptr,
+             obj->_tao_QueryInterface
+               (
+                 ACE_reinterpret_cast
+                   (
+                     ptr_arith_t,
+-                    &TypedefDef::_tao_class_id
++                      &CORBA_TypedefDef::_tao_class_id
+                   )
+               )
+         );
+ }
+ 
+-CORBA::TypedefDef_ptr
+-CORBA::TypedefDef::_duplicate (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 ACE_ENV_ARG_DECL)
++CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
  {
    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
-@@ -14707,101 +13499,9 @@
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+@@ -14751,46 +13495,46 @@
+     return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+ }
  
- const char* CORBA_TypedefDef::_interface_repository_id (void) const
+-void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
++void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
  {
--  return "IDL:omg.org/CORBA_TypedefDef:1.0";
-+  return "IDL:omg.org/CORBA/TypedefDef:1.0";
+   void *retv = 0;
+   if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, TypedefDef)::_tao_class_id))
++      &CORBA_TypedefDef::_tao_class_id))
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, Contained)::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::Contained_ptr,
++            CORBA_Contained_ptr,
+             this
+           )
+       );
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IDLType)::_tao_class_id))
++      &CORBA_IDLType::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IDLType_ptr,
++            CORBA_IDLType_ptr,
+             this
+           )
+       );
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -14803,161 +13547,14 @@
+   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";
  }
  
 -static const CORBA::Long _oc_CORBA_TypedefDef[] =
@@ -1621,17 +13169,15 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x412f5479), 
 -  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
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
+-  11,
+-  ACE_NTOHL (0x54797065), 
+-  ACE_NTOHL (0x64656644), 
+-  ACE_NTOHL (0x65660000),  // name = TypedefDef
 -};
 -
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (
@@ -1639,11 +13185,13 @@
 -    sizeof (_oc_CORBA_TypedefDef),
 -    (char *) &_oc_CORBA_TypedefDef,
 -    0,
--    sizeof (CORBA_TypedefDef)
+-    sizeof (CORBA::TypedefDef)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_TypedefDef =
--  &_tc_TAO_tc_CORBA_TypedefDef;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_CORBA_TypedefDef)
+-TAO_NAMESPACE_END
 -
 -static const CORBA::Long _oc_CORBA_TypeDescription[] =
 -{
@@ -1653,40 +13201,93 @@
 -  ACE_NTOHL (0x6f6d672e), 
 -  ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x412f5479), 
 -  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
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
+-  16,
+-  ACE_NTOHL (0x54797065), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e00),  // name = TypeDescription
 -  5, // member count
 -  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_string, 
--  0U, // string length
+-  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_string, 
--  0U, // string length
+-  0xffffffff, // indirection
+-  0xffffff9c, // negative offset (-100)
 -  8,
 -  ACE_NTOHL (0x76657273), 
 -  ACE_NTOHL (0x696f6e00),  // name = version
--  CORBA::tk_string, 
--  0U, // string length
+-  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
@@ -1699,619 +13300,2800 @@
 -    sizeof (_oc_CORBA_TypeDescription),
 -    (char *) &_oc_CORBA_TypeDescription,
 -    0,
--    sizeof (CORBA_TypeDescription)
+-    sizeof (CORBA::TypeDescription)
 -  );
 -
--CORBA::TypeCode_ptr _tc_CORBA_TypeDescription =
--  &_tc_TAO_tc_CORBA_TypeDescription;
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_CORBA_TypeDescription)
+-TAO_NAMESPACE_END
 -
- void CORBA_TypeDescription::_tao_any_destructor (void *x)
+-void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
++void CORBA_TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
  {
-   CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*,x);
-@@ -14854,7 +13554,7 @@
+-  TypeDescription *tmp = ACE_static_cast (TypeDescription*, _tao_void_pointer);
++  CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*, _tao_void_pointer);
+   delete tmp;
+ }
+ 
+@@ -15001,17 +13598,9 @@
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -15019,98 +13608,60 @@
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+-          CORBA::IRObject::_duplicate (_tao_elem),
+-          CORBA::IRObject::_tao_any_destructor
+-        );
+-    }
+-}
+-
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::IRObject_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          CORBA::_tc_IRObject, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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_any._tao_replace (
--        _tc_CORBA_IRObject, 
-+        CORBA::_tc_IRObject, 
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -14871,7 +13571,7 @@
-     _tao_elem = CORBA_IRObject::_nil ();
+-    _tao_elem = CORBA::IRObject::_nil ();
++    _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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_IRObject
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14884,7 +13584,7 @@
+-      {
+         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_IRObject,
+             1,
+             _tao_elem,
+-            CORBA::IRObject::_tao_any_destructor
++          CORBA_IRObject::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _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 */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
      {
-       ((CORBA::Any *)&_tao_any)->_tao_replace (
--          _tc_CORBA_IRObject,
-+          CORBA::_tc_IRObject,
+       _tao_any._tao_replace (
+@@ -15118,198 +13669,124 @@
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
            1,
-           _tao_elem,
-           CORBA_IRObject::_tao_any_destructor
-@@ -14915,7 +13615,7 @@
-   if (stream << _tao_elem)
+-          CORBA::Contained::_duplicate (_tao_elem),
+-          CORBA::Contained::_tao_any_destructor
+-        );
+-    }
+-}
+-
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Contained_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          CORBA::_tc_Contained, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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_any._tao_replace (
--        _tc_CORBA_Contained, 
-+        CORBA::_tc_Contained, 
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -14932,7 +13632,7 @@
-     _tao_elem = CORBA_Contained::_nil ();
+-    _tao_elem = CORBA::Contained::_nil ();
++    _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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_Contained
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14945,7 +13645,7 @@
+-      {
+         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 (
--          _tc_CORBA_Contained,
-+          CORBA::_tc_Contained,
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+             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 ();
++    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 */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::Contained::Description &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_Contained::Description &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+-          CORBA::Contained::_tc_Description,
++      CORBA_Contained::_tc_Description,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Contained::Description *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_Contained::Description *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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::_tao_any_destructor
-@@ -15062,7 +13762,7 @@
-   if (stream << _tao_elem)
+-          CORBA::Contained::Description::_tao_any_destructor
++      CORBA_Contained::Description::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_ContainedSeq,
-+        CORBA::_tc_ContainedSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15074,7 +13774,7 @@
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::Contained::_tc_Description
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     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 ()
+           );
+-        
+         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;
+           }
+@@ -15323,22 +13800,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::ContainedSeq &_tao_elem
+-  )
++    const CORBA_ContainedSeq &_tao_elem
++  ) // copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_ContainedSeq,
-+      CORBA::_tc_ContainedSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15098,7 +13798,7 @@
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -15349,95 +13819,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::ContainedSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_ContainedSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_ContainedSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::ContainedSeq::_tao_any_destructor
++      CORBA_ContainedSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_ContainedSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15123,7 +13823,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_ContainedSeq,
-+            CORBA::_tc_ContainedSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_ContainedSeq::_tao_any_destructor
-@@ -15153,7 +13853,7 @@
-   if (stream << _tao_elem)
+         _tao_elem = ACE_static_cast(
+-            const CORBA::ContainedSeq*,
++          const CORBA_ContainedSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::ContainedSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_ContainedSeq,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::ContainedSeq::_tao_any_destructor
++            CORBA_ContainedSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -15451,22 +13891,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_InterfaceDefSeq,
-+        CORBA::_tc_InterfaceDefSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15165,7 +13865,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::InterfaceDefSeq &_tao_elem
+-  )
++    const CORBA_InterfaceDefSeq &_tao_elem
++  ) // copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_InterfaceDefSeq,
-+      CORBA::_tc_InterfaceDefSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15189,7 +13889,7 @@
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -15477,95 +13910,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::InterfaceDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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_InterfaceDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    CORBA::InterfaceDefSeq *&_tao_elem
+-  )
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDefSeq *&_tao_elem)
+ {
+   return _tao_any >>= ACE_const_cast(
+-      const CORBA::InterfaceDefSeq*&,
++      const CORBA_InterfaceDefSeq*&,
+       _tao_elem
+     );
+ }
+ 
+-// Extraction to const pointer.
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    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 (_tc_CORBA_InterfaceDefSeq, ACE_TRY_ENV);
-+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_InterfaceDefSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15214,7 +13914,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_InterfaceDefSeq,
-+            CORBA::_tc_InterfaceDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_InterfaceDefSeq::_tao_any_destructor
-@@ -15244,7 +13944,7 @@
-   if (stream << _tao_elem)
+         _tao_elem = ACE_static_cast(
+-            const CORBA::InterfaceDefSeq*,
++          const CORBA_InterfaceDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::InterfaceDefSeq *tmp = 0;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            CORBA::InterfaceDefSeq,
+-            0
+-          );
+-        
++      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
++            CORBA_InterfaceDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -15579,22 +13982,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_ValueDefSeq,
-+        CORBA::_tc_ValueDefSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15256,7 +13956,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::ValueDefSeq &_tao_elem
+-  )
++    const CORBA_ValueDefSeq &_tao_elem
++  ) // copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_ValueDefSeq,
-+      CORBA::_tc_ValueDefSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15280,7 +13980,7 @@
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -15605,95 +14001,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::ValueDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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_ValueDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    CORBA::ValueDefSeq *&_tao_elem
+-  )
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDefSeq *&_tao_elem)
+ {
+   return _tao_any >>= ACE_const_cast(
+-      const CORBA::ValueDefSeq*&,
++      const CORBA_ValueDefSeq*&,
+       _tao_elem
+     );
+ }
+ 
+-// Extraction to const pointer.
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    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 (_tc_CORBA_ValueDefSeq, ACE_TRY_ENV);
-+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_ValueDefSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15305,7 +14005,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_ValueDefSeq,
-+            CORBA::_tc_ValueDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_ValueDefSeq::_tao_any_destructor
-@@ -15335,7 +14035,7 @@
-   if (stream << _tao_elem)
+         _tao_elem = ACE_static_cast(
+-            const CORBA::ValueDefSeq*,
++          const CORBA_ValueDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::ValueDefSeq *tmp = 0;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            CORBA::ValueDefSeq,
+-            0
+-          );
+-        
++      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
++            CORBA_ValueDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -15707,22 +14073,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_AbstractInterfaceDefSeq,
-+        CORBA::_tc_AbstractInterfaceDefSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15347,7 +14047,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::AbstractInterfaceDefSeq &_tao_elem
+-  )
++    const CORBA_AbstractInterfaceDefSeq &_tao_elem
++  ) // copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_AbstractInterfaceDefSeq,
-+      CORBA::_tc_AbstractInterfaceDefSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15371,7 +14071,7 @@
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -15733,95 +14092,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::AbstractInterfaceDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_AbstractInterfaceDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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_AbstractInterfaceDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    CORBA::AbstractInterfaceDefSeq *&_tao_elem
+-  )
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceDefSeq *&_tao_elem)
+ {
+   return _tao_any >>= ACE_const_cast(
+-      const CORBA::AbstractInterfaceDefSeq*&,
++      const CORBA_AbstractInterfaceDefSeq*&,
+       _tao_elem
+     );
+ }
+ 
+-// Extraction to const pointer.
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    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 (_tc_CORBA_AbstractInterfaceDefSeq, ACE_TRY_ENV);
-+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq, ACE_TRY_ENV);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_AbstractInterfaceDefSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15396,7 +14096,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_AbstractInterfaceDefSeq,
-+            CORBA::_tc_AbstractInterfaceDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
-@@ -15426,7 +14126,7 @@
-   if (stream << _tao_elem)
+         _tao_elem = ACE_static_cast(
+-            const CORBA::AbstractInterfaceDefSeq*,
++          const CORBA_AbstractInterfaceDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::AbstractInterfaceDefSeq *tmp = 0;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            CORBA::AbstractInterfaceDefSeq,
+-            0
+-          );
+-        
++      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
++            CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -15835,22 +14164,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_LocalInterfaceDefSeq,
-+        CORBA::_tc_LocalInterfaceDefSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15438,7 +14138,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::LocalInterfaceDefSeq &_tao_elem
+-  )
++    const CORBA_LocalInterfaceDefSeq &_tao_elem
++  ) // copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_LocalInterfaceDefSeq,
-+      CORBA::_tc_LocalInterfaceDefSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15462,7 +14162,7 @@
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -15861,95 +14183,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::LocalInterfaceDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_LocalInterfaceDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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_LocalInterfaceDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    CORBA::LocalInterfaceDefSeq *&_tao_elem
+-  )
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDefSeq *&_tao_elem)
+ {
+   return _tao_any >>= ACE_const_cast(
+-      const CORBA::LocalInterfaceDefSeq*&,
++      const CORBA_LocalInterfaceDefSeq*&,
+       _tao_elem
+     );
+ }
+ 
+-// Extraction to const pointer.
+-CORBA::Boolean operator>>= (
+-    const CORBA::Any &_tao_any,
+-    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 (_tc_CORBA_LocalInterfaceDefSeq, ACE_TRY_ENV);
-+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq, ACE_TRY_ENV);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_LocalInterfaceDefSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15487,7 +14187,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_LocalInterfaceDefSeq,
-+            CORBA::_tc_LocalInterfaceDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_LocalInterfaceDefSeq::_tao_any_destructor
-@@ -15513,7 +14213,7 @@
+         _tao_elem = ACE_static_cast(
+-            const CORBA::LocalInterfaceDefSeq*,
++          const CORBA_LocalInterfaceDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::LocalInterfaceDefSeq *tmp = 0;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            CORBA::LocalInterfaceDefSeq,
+-            0
+-          );
+-        
++      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
++            CORBA_LocalInterfaceDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -15963,121 +14255,76 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::StructMember &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_StructMember &_tao_elem) // copying
+ {
    TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_StructMember,
-+      CORBA::_tc_StructMember,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
-@@ -15524,7 +14224,7 @@
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_StructMember,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::StructMember *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_StructMember *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_StructMember,
-+      CORBA::_tc_StructMember,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15545,7 +14245,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_StructMember,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::StructMember::_tao_any_destructor
++      CORBA_StructMember::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_StructMember
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
-     if (!result)
-@@ -15570,7 +14270,7 @@
-       if (stream >> *tmp)
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_StructMember,
-+            CORBA::_tc_StructMember,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_StructMember::_tao_any_destructor
-@@ -15600,7 +14300,7 @@
-   if (stream << _tao_elem)
+         _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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_StructMember,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::StructMember::_tao_any_destructor
++            CORBA_StructMember::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16091,22 +14338,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_StructMemberSeq,
-+        CORBA::_tc_StructMemberSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15612,7 +14312,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::StructMemberSeq &_tao_elem
+-  )
++    const CORBA_StructMemberSeq &_tao_elem
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -16117,95 +14357,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::StructMemberSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_StructMemberSeq *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_StructMemberSeq,
-+      CORBA::_tc_StructMemberSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15636,7 +14336,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_StructMemberSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::StructMemberSeq::_tao_any_destructor
++      CORBA_StructMemberSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_StructMemberSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15661,7 +14361,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_StructMemberSeq,
-+            CORBA::_tc_StructMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_StructMemberSeq::_tao_any_destructor
-@@ -15687,7 +14387,7 @@
+         _tao_elem = ACE_static_cast(
+-            const CORBA::StructMemberSeq*,
++          const CORBA_StructMemberSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::StructMemberSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_StructMemberSeq,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::StructMemberSeq::_tao_any_destructor
++            CORBA_StructMemberSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16219,121 +14429,76 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::Initializer &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_Initializer &_tao_elem) // copying
+ {
    TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_Initializer,
-+      CORBA::_tc_Initializer,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
-@@ -15698,7 +14398,7 @@
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_Initializer,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Initializer *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_Initializer *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_Initializer,
-+      CORBA::_tc_Initializer,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15719,7 +14419,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_Initializer,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::Initializer::_tao_any_destructor
++      CORBA_Initializer::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_Initializer
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
-     if (!result)
-@@ -15744,7 +14444,7 @@
-       if (stream >> *tmp)
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_Initializer,
-+            CORBA::_tc_Initializer,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_Initializer::_tao_any_destructor
-@@ -15774,7 +14474,7 @@
-   if (stream << _tao_elem)
+         _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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_Initializer,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::Initializer::_tao_any_destructor
++            CORBA_Initializer::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16347,22 +14512,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_InitializerSeq,
-+        CORBA::_tc_InitializerSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15786,7 +14486,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::InitializerSeq &_tao_elem
+-  )
++    const CORBA_InitializerSeq &_tao_elem
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -16373,95 +14531,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::InitializerSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_InitializerSeq *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_InitializerSeq,
-+      CORBA::_tc_InitializerSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15810,7 +14510,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_InitializerSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::InitializerSeq::_tao_any_destructor
++      CORBA_InitializerSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_InitializerSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15835,7 +14535,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_InitializerSeq,
-+            CORBA::_tc_InitializerSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_InitializerSeq::_tao_any_destructor
-@@ -15861,7 +14561,7 @@
+         _tao_elem = ACE_static_cast(
+-            const CORBA::InitializerSeq*,
++          const CORBA_InitializerSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::InitializerSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_InitializerSeq,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::InitializerSeq::_tao_any_destructor
++            CORBA_InitializerSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16475,121 +14603,76 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::UnionMember &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_UnionMember &_tao_elem) // copying
+ {
    TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_UnionMember,
-+      CORBA::_tc_UnionMember,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
-@@ -15872,7 +14572,7 @@
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_UnionMember,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::UnionMember *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_UnionMember *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_UnionMember,
-+      CORBA::_tc_UnionMember,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15893,7 +14593,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_UnionMember,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::UnionMember::_tao_any_destructor
++      CORBA_UnionMember::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_UnionMember
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
-     if (!result)
-@@ -15918,7 +14618,7 @@
-       if (stream >> *tmp)
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_UnionMember,
-+            CORBA::_tc_UnionMember,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_UnionMember::_tao_any_destructor
-@@ -15948,7 +14648,7 @@
-   if (stream << _tao_elem)
+         _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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_UnionMember,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::UnionMember::_tao_any_destructor
++            CORBA_UnionMember::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16603,22 +14686,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_UnionMemberSeq,
-+        CORBA::_tc_UnionMemberSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -15960,7 +14660,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::UnionMemberSeq &_tao_elem
+-  )
++    const CORBA_UnionMemberSeq &_tao_elem
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -16629,95 +14705,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::UnionMemberSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_UnionMemberSeq *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_UnionMemberSeq,
-+      CORBA::_tc_UnionMemberSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -15984,7 +14684,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_UnionMemberSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::UnionMemberSeq::_tao_any_destructor
++      CORBA_UnionMemberSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_UnionMemberSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16009,7 +14709,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_UnionMemberSeq,
-+            CORBA::_tc_UnionMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_UnionMemberSeq::_tao_any_destructor
-@@ -16039,7 +14739,7 @@
-   if (stream << _tao_elem)
+         _tao_elem = ACE_static_cast(
+-            const CORBA::UnionMemberSeq*,
++          const CORBA_UnionMemberSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::UnionMemberSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_UnionMemberSeq,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::UnionMemberSeq::_tao_any_destructor
++            CORBA_UnionMemberSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16731,22 +14777,15 @@
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_EnumMemberSeq,
-+        CORBA::_tc_EnumMemberSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-@@ -16051,7 +14751,7 @@
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::EnumMemberSeq &_tao_elem
+-  )
++    const CORBA_EnumMemberSeq &_tao_elem
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -16757,95 +14796,65 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::EnumMemberSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_EnumMemberSeq *_tao_elem) // non copying
+ {
    TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_EnumMemberSeq,
-+      CORBA::_tc_EnumMemberSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -16075,7 +14775,7 @@
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_EnumMemberSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::EnumMemberSeq::_tao_any_destructor
++      CORBA_EnumMemberSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
      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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_EnumMemberSeq
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16100,7 +14800,7 @@
-       if (stream >> *tmp)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
        {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_CORBA_EnumMemberSeq,
-+            CORBA::_tc_EnumMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
-             CORBA_EnumMemberSeq::_tao_any_destructor
-@@ -16127,7 +14827,7 @@
+         _tao_elem = ACE_static_cast(
+-            const CORBA::EnumMemberSeq*,
++          const CORBA_EnumMemberSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        CORBA::EnumMemberSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_EnumMemberSeq,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::EnumMemberSeq::_tao_any_destructor
++            CORBA_EnumMemberSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -16859,21 +14868,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -16881,198 +14881,124 @@
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+-          CORBA::Container::_duplicate (_tao_elem),
+-          CORBA::Container::_tao_any_destructor
+-        );
+-    }
+-}
+-
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Container_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          CORBA::_tc_Container, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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_any._tao_replace (
--        _tc_CORBA_Container, 
-+        CORBA::_tc_Container, 
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -16144,7 +14844,7 @@
-     _tao_elem = CORBA_Container::_nil ();
+-    _tao_elem = CORBA::Container::_nil ();
++    _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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_Container
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16157,7 +14857,7 @@
+-      {
+         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 (
--          _tc_CORBA_Container,
-+          CORBA::_tc_Container,
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+             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 ();
++    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 */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::Container::Description &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_Container::Description &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+-          CORBA::Container::_tc_Description,
++      CORBA_Container::_tc_Description,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Container::Description *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_Container::Description *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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::_tao_any_destructor
-@@ -16362,7 +15062,7 @@
-   if (stream << _tao_elem)
+-          CORBA::Container::Description::_tao_any_destructor
++      CORBA_Container::Description::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
    {
-     _tao_any._tao_replace (
--        _tc_CORBA_IDLType, 
-+        CORBA::_tc_IDLType, 
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -16379,7 +15079,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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::Container::_tc_Description
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
-     if (!result)
-@@ -16392,7 +15092,7 @@
-     if (stream >> _tao_elem)
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     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 ()
+           );
+-        
+         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;
+           }
+@@ -17086,121 +15012,84 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ 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)
      {
-       ((CORBA::Any *)&_tao_any)->_tao_replace (
--          _tc_CORBA_IDLType,
-+          CORBA::_tc_IDLType,
+       _tao_any._tao_replace (
+-          CORBA::Container::_tc_DescriptionSeq,
++        CORBA_Container::_tc_DescriptionSeq,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::Container::DescriptionSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_Container::DescriptionSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  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_IDLType::_tao_any_destructor
-@@ -16423,7 +15123,7 @@
+-          CORBA::Container::DescriptionSeq::_tao_any_destructor
++      CORBA_Container::DescriptionSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     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 = 0;
+-        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 ()
+           );
+-        
+         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;
+           }
+@@ -17214,21 +15103,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -17236,98 +15116,60 @@
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+-          CORBA::IDLType::_duplicate (_tao_elem),
+-          CORBA::IDLType::_tao_any_destructor
+-        );
+-    }
+-}
+-
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::IDLType_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          CORBA::_tc_IDLType, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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_any._tao_replace (
--        _tc_CORBA_TypedefDef, 
-+        CORBA::_tc_TypedefDef, 
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -16440,7 +15140,7 @@
-     _tao_elem = CORBA_TypedefDef::_nil ();
+-    _tao_elem = CORBA::IDLType::_nil ();
++    _tao_elem = CORBA_IDLType::_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);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_IDLType
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16453,7 +15153,7 @@
+-      {
+         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_IDLType,
+             1,
+             _tao_elem,
+-            CORBA::IDLType::_tao_any_destructor
++          CORBA_IDLType::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _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 */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
      {
-       ((CORBA::Any *)&_tao_any)->_tao_replace (
--          _tc_CORBA_TypedefDef,
-+          CORBA::_tc_TypedefDef,
+       _tao_any._tao_replace (
+@@ -17335,198 +15177,124 @@
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
            1,
-           _tao_elem,
-           CORBA_TypedefDef::_tao_any_destructor
-@@ -16483,7 +15183,7 @@
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_TypeDescription,
-+      CORBA::_tc_TypeDescription,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
-@@ -16494,7 +15194,7 @@
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      _tc_CORBA_TypeDescription,
-+      CORBA::_tc_TypeDescription,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-@@ -16515,7 +15215,7 @@
+-          CORBA::TypedefDef::_duplicate (_tao_elem),
+-          CORBA::TypedefDef::_tao_any_destructor
+-        );
+-    }
+-}
+-
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::TypedefDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          CORBA::_tc_TypedefDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 (_tc_CORBA_TypeDescription, ACE_TRY_ENV);
-+    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription, ACE_TRY_ENV);
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_TypedefDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16540,7 +15240,7 @@
-       if (stream >> *tmp)
+-      {
+         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 (
--            _tc_CORBA_TypeDescription,
-+            CORBA::_tc_TypeDescription,
+             CORBA::_tc_TypedefDef,
              1,
-             ACE_static_cast (void *, tmp),
-             CORBA_TypeDescription::_tao_any_destructor
-@@ -16664,11 +15364,6 @@
+             _tao_elem,
+-            CORBA::TypedefDef::_tao_any_destructor
++          CORBA_TypedefDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _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 */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const CORBA::TypeDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const CORBA_TypeDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_TypeDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    CORBA::TypeDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, CORBA_TypeDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           CORBA::_tc_TypeDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin (),
+           1,
+           _tao_elem,
+-          CORBA::TypeDescription::_tao_any_destructor
++      CORBA_TypeDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          CORBA::_tc_TypeDescription
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+                 CORBA::_tc_TypeDescription,
+                 1,
+                 ACE_static_cast (void *, tmp),
+-                CORBA::TypeDescription::_tao_any_destructor
++            CORBA_TypeDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -17540,13 +15308,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+ 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;
+@@ -17555,7 +15322,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::IRObject_ptr &_tao_objref
++    CORBA_IRObject_ptr &_tao_objref
+   )
+ {
+   ACE_TRY_NEW_ENV
+@@ -17565,7 +15332,7 @@
+       return 0;
+     // narrow to the right type
+     _tao_objref =
+-      CORBA::IRObject::_unchecked_narrow (
++      CORBA_IRObject::_unchecked_narrow (
+           obj.in ()
+           ACE_ENV_ARG_PARAMETER
+         );
+@@ -17582,7 +15349,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::Contained_ptr _tao_objref
++    const CORBA_Contained_ptr _tao_objref
+   )
+ {
+   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -17591,7 +15358,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::Contained_ptr &_tao_objref
++    CORBA_Contained_ptr &_tao_objref
+   )
+ {
+   ACE_TRY_NEW_ENV
+@@ -17601,7 +15368,7 @@
+       return 0;
+     // narrow to the right type
+     _tao_objref =
+-      CORBA::Contained::_unchecked_narrow (
++      CORBA_Contained::_unchecked_narrow (
+           obj.in ()
+           ACE_ENV_ARG_PARAMETER
+         );
+@@ -17618,7 +15385,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::ContainedSeq &_tao_sequence
++    const CORBA_ContainedSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17636,7 +15403,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::ContainedSeq &_tao_sequence
++    CORBA_ContainedSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17647,11 +15414,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2323,7 +16105,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16711,11 +15406,6 @@
+@@ -17665,7 +15427,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::InterfaceDefSeq &_tao_sequence
++    const CORBA_InterfaceDefSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17683,7 +15445,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::InterfaceDefSeq &_tao_sequence
++    CORBA_InterfaceDefSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17694,11 +15456,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2335,7 +16135,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16758,11 +15448,6 @@
+@@ -17712,7 +15469,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::ValueDefSeq &_tao_sequence
++    const CORBA_ValueDefSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17730,7 +15487,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::ValueDefSeq &_tao_sequence
++    CORBA_ValueDefSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17741,11 +15498,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2347,7 +16165,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16805,11 +15490,6 @@
+@@ -17759,7 +15511,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::AbstractInterfaceDefSeq &_tao_sequence
++    const CORBA_AbstractInterfaceDefSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17777,7 +15529,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::AbstractInterfaceDefSeq &_tao_sequence
++    CORBA_AbstractInterfaceDefSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17788,11 +15540,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2359,7 +16195,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16852,11 +15532,6 @@
+@@ -17806,7 +15553,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::LocalInterfaceDefSeq &_tao_sequence
++    const CORBA_LocalInterfaceDefSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17824,7 +15571,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::LocalInterfaceDefSeq &_tao_sequence
++    CORBA_LocalInterfaceDefSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17835,11 +15582,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2371,7 +16225,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16899,11 +15574,6 @@
+@@ -17853,7 +15595,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::StructMemberSeq &_tao_sequence
++    const CORBA_StructMemberSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17871,7 +15613,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::StructMemberSeq &_tao_sequence
++    CORBA_StructMemberSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17882,11 +15624,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2383,7 +16255,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16946,11 +15616,6 @@
+@@ -17900,7 +15637,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::InitializerSeq &_tao_sequence
++    const CORBA_InitializerSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17918,7 +15655,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::InitializerSeq &_tao_sequence
++    CORBA_InitializerSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17929,11 +15666,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2395,7 +16285,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -16993,11 +15658,6 @@
+@@ -17947,7 +15679,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::UnionMemberSeq &_tao_sequence
++    const CORBA_UnionMemberSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -17965,7 +15697,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::UnionMemberSeq &_tao_sequence
++    CORBA_UnionMemberSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -17976,11 +15708,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2407,7 +16315,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -17040,11 +15700,6 @@
+@@ -17994,7 +15721,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::EnumMemberSeq &_tao_sequence
++    const CORBA_EnumMemberSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -18012,7 +15739,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::EnumMemberSeq &_tao_sequence
++    CORBA_EnumMemberSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -18023,11 +15750,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2419,7 +16345,25 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -17087,11 +15742,6 @@
+@@ -18041,7 +15763,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::Container::DescriptionSeq &_tao_sequence
++    const CORBA_Container::DescriptionSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -18059,7 +15781,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::Container::DescriptionSeq &_tao_sequence
++    CORBA_Container::DescriptionSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -18070,11 +15792,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2431,3 +16375,89 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -18088,7 +15805,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::Container_ptr _tao_objref
++    const CORBA_Container_ptr _tao_objref
+   )
+ {
+   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -18097,7 +15814,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::Container_ptr &_tao_objref
++    CORBA_Container_ptr &_tao_objref
+   )
+ {
+   ACE_TRY_NEW_ENV
+@@ -18107,7 +15824,7 @@
+       return 0;
+     // narrow to the right type
+     _tao_objref =
+-      CORBA::Container::_unchecked_narrow (
++      CORBA_Container::_unchecked_narrow (
+           obj.in ()
+           ACE_ENV_ARG_PARAMETER
+         );
+@@ -18124,7 +15841,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::IDLType_ptr _tao_objref
++    const CORBA_IDLType_ptr _tao_objref
+   )
+ {
+   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -18133,7 +15850,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::IDLType_ptr &_tao_objref
++    CORBA_IDLType_ptr &_tao_objref
+   )
+ {
+   ACE_TRY_NEW_ENV
+@@ -18143,7 +15860,7 @@
+       return 0;
+     // narrow to the right type
+     _tao_objref =
+-      CORBA::IDLType::_unchecked_narrow (
++      CORBA_IDLType::_unchecked_narrow (
+           obj.in ()
+           ACE_ENV_ARG_PARAMETER
+         );
+@@ -18160,7 +15877,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::TypedefDef_ptr _tao_objref
++    const CORBA_TypedefDef_ptr _tao_objref
+   )
+ {
+   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -18169,7 +15886,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::TypedefDef_ptr &_tao_objref
++    CORBA_TypedefDef_ptr &_tao_objref
+   )
+ {
+   ACE_TRY_NEW_ENV
+@@ -18179,7 +15896,7 @@
+       return 0;
+     // narrow to the right type
+     _tao_objref =
+-      CORBA::TypedefDef::_unchecked_narrow (
++      CORBA_TypedefDef::_unchecked_narrow (
+           obj.in ()
+           ACE_ENV_ARG_PARAMETER
+         );
+@@ -18193,4 +15910,3 @@
+   ACE_ENDTRY;
+   return 0;
+ }
+-
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
index f3c35a09c08..64eccc74deb 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseC.h	Tue Apr 24 23:25:42 2001
-+++ IFR_BaseC.h	Tue Apr 24 22:39:24 2001
+--- orig/IFR_BaseC.h	Sat Mar 16 01:41:17 2002
++++ IFR_BaseC.h	Sat Mar 16 01:30:49 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,8 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,13 +23,14 @@
- #define _TAO_IDL_IFR_BASEC_H_
+@@ -19,17 +19,19 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
+-#define _TAO_IDL_ORIG_IFR_BASEC_H_
++#ifndef _TAO_IDL_IFR_BASEC_H_
++#define _TAO_IDL_IFR_BASEC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
@@ -20,709 +26,7622 @@
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
 -#include "ifr_client_export.h"
-+#include "tao/Invocation.h"
-+#include "tao/PortableInterceptor.h"
++#include "tao/Remote_Object_Proxy_Impl.h"
++#include "tao/Object.h"
++#include "tao/Any.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -54,50 +55,10 @@
+@@ -54,62 +56,11 @@
  #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 * 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;
+-  
 -  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    
+-    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
--
--
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
+-  
+   
  #if !defined (_CORBA_IROBJECT___PTR_CH_)
  #define _CORBA_IROBJECT___PTR_CH_
+   
+-  class IRObject;
+-  typedef IRObject *IRObject_ptr;
++class CORBA_IRObject;
+   
+ #endif /* end #if !defined */
+   
+@@ -117,43 +68,43 @@
+ #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;
+     
+     // Hooks used by template sequence and object manager classes
+     // for non-defined forward declared interfaces.
+-    static IRObject_ptr tao_duplicate (IRObject_ptr);
+-    static void tao_release (IRObject_ptr);
+-    static IRObject_ptr tao_nil (void);
+-    static IRObject_ptr tao_narrow (
++  static CORBA_IRObject_ptr tao_duplicate (CORBA_IRObject_ptr);
++  static void tao_release (CORBA_IRObject_ptr);
++  static CORBA_IRObject_ptr tao_nil (void);
++  static CORBA_IRObject_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   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);
+   };
  
- class CORBA_IRObject;
--typedef CORBA_IRObject *CORBA_IRObject_ptr;
  
+@@ -163,123 +114,115 @@
+ #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 */
+   
+-  // *************************************************************
+-  // CORBA::IRObject
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_interface/interface_ch.cpp:106
+-  // *************************************************************
+-  
+   
+ #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;
++// Forward Classes Declaration
++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;
+   
+-  class TAO_IFR_Client_Export IRObject
++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 */
  
-@@ -397,18 +358,8 @@
+     static int _tao_class_id;
+     
+-    // The static operations.
+-    static IRObject_ptr _duplicate (IRObject_ptr obj);
++  // the static operations
++  static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
+     
+-    static IRObject_ptr _narrow (
++  static CORBA_IRObject_ptr _narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static IRObject_ptr _unchecked_narrow (
++
++  static CORBA_IRObject_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    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 ::CORBA::DefinitionKind def_kind (
++  virtual CORBA::DefinitionKind def_kind (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual void destroy (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual CORBA::Boolean _is_a (
+         const CORBA::Char *type_id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+     virtual void *_tao_QueryInterface (ptr_arith_t type);
+     
+     virtual const char* _interface_repository_id (void) const;
  
+   private:
+-    _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
++  _TAO_CORBA_IRObject_Proxy_Broker *the_TAO_CORBA_IRObject_Proxy_Broker_;
+     
+   protected:
+-    IRObject (int collocated = 0);
++  CORBA_IRObject (int collocated = 0);
+     
+-    // These methods travese the inheritance tree and set the
++  // 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
+       );
+     
+-    friend class _TAO_IRObject_Remote_Proxy_Impl;
+-    friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+-    friend class _TAO_IRObject_Direct_Proxy_Impl;
++  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 ~IRObject (void);
++  virtual ~CORBA_IRObject (void);
+   
+   private:
+-    IRObject (const IRObject &);
+-    void operator= (const IRObject &);
++  CORBA_IRObject (const CORBA_IRObject &);
++  void operator= (const CORBA_IRObject &);
+   };
+   
+   // The Proxy Implementations are used by each interface to
+@@ -291,12 +234,12 @@
+   //                    Base Proxy Impl. Declaration
+   //
+   
+-  class TAO_IFR_Client_Export _TAO_IRObject_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 ::CORBA::DefinitionKind def_kind (
++  virtual ~_TAO_CORBA_IRObject_Proxy_Impl (void) { }
++  virtual CORBA::DefinitionKind def_kind (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -314,7 +257,7 @@
+     
+     
+   protected:
+-    _TAO_IRObject_Proxy_Impl (void);
++  _TAO_CORBA_IRObject_Proxy_Impl (void);
+   };
+   
+   //
+@@ -326,15 +269,15 @@
+   //                Remote Proxy 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 ::CORBA::DefinitionKind def_kind (
++  virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Impl (void) { }
++  virtual CORBA::DefinitionKind def_kind (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -367,17 +310,17 @@
+   //                 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 (
+-        IRObject *object
++  virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void);
++  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
++      CORBA_IRObject *object
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+       ) = 0;
+     
+   protected:
+-    _TAO_IRObject_Proxy_Broker (void);
++  _TAO_CORBA_IRObject_Proxy_Broker (void);
+     
+   };
+   
+@@ -390,27 +333,27 @@
+   //                 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 (
+-        IRObject *object
++  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
++      CORBA_IRObject *object
+         ACE_ENV_ARG_DECL
+       );
+     
+   private:
+-    _TAO_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
++    _TAO_CORBA_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
+   
+   public:
+     // 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.
+-    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);
+   };
+   
+   //
+@@ -420,142 +363,48 @@
+   
  #endif /* end #if !defined */
- 
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_IRObject;
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject;
+-  
+-  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 (_CORBA_CONTAINED___PTR_CH_)
+-#define _CORBA_CONTAINED___PTR_CH_
+-  
+-  typedef Contained *Contained_ptr;
+-  
+-#endif /* end #if !defined */
+-  
+-  
+-#if !defined (_CORBA_CONTAINED___VAR_CH_)
+-#define _CORBA_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;
+-    
+-    // Hooks used by template sequence and object manager classes
+-    // for non-defined forward declared interfaces.
+-    static Contained_ptr tao_duplicate (Contained_ptr);
+-    static void tao_release (Contained_ptr);
+-    static Contained_ptr tao_nil (void);
+-    static Contained_ptr tao_narrow (
+-        CORBA::Object *
+-        ACE_ENV_ARG_DECL_NOT_USED
+-      );
+-    static CORBA::Object * tao_upcast (void *);
+-  
+-  private:
+-    Contained_ptr ptr_;
+-    // Unimplemented - prevents widening assignment.
+-    Contained_var (const TAO_Base_var &rhs);
+-    Contained_var &operator= (const TAO_Base_var &rhs);
+-  };
 -
- class CORBA_Repository;
- 
+-
+-#endif /* end #if !defined */
+-  
+-  
+-#if !defined (_CORBA_CONTAINED___OUT_CH_)
+-#define _CORBA_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 (_CORBA_REPOSITORY___PTR_CH_)
 -#define _CORBA_REPOSITORY___PTR_CH_
--
--typedef CORBA_Repository *CORBA_Repository_ptr;
--
+-  
+-  typedef Repository *Repository_ptr;
+-  
 -#endif /* end #if !defined */
--
--
+-  
++  class CORBA_Repository;
+   
  #if !defined (_CORBA_REPOSITORY___VAR_CH_)
  #define _CORBA_REPOSITORY___VAR_CH_
+   
+-  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
++  class TAO_IFR_Client_Export CORBA_Repository_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
++    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
+     
+-    Repository_var &operator= (Repository_ptr);
+-    Repository_var &operator= (const Repository_var &);
+-    Repository_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 Repository_ptr &() const;
+-    operator Repository_ptr &();
++    operator const CORBA_Repository_ptr &() const;
++    operator CORBA_Repository_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;
++    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 Repository_ptr tao_duplicate (Repository_ptr);
+-    static void tao_release (Repository_ptr);
+-    static Repository_ptr tao_nil (void);
+-    static Repository_ptr tao_narrow (
++    static CORBA_Repository_ptr tao_duplicate (CORBA_Repository_ptr);
++    static void tao_release (CORBA_Repository_ptr);
++    static CORBA_Repository_ptr tao_nil (void);
++    static CORBA_Repository_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    Repository_ptr ptr_;
++    CORBA_Repository_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    Repository_var (const TAO_Base_var &rhs);
+-    Repository_var &operator= (const TAO_Base_var &rhs);
++    CORBA_Repository_var (const TAO_Base_var &rhs);
++    CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
+   };
  
-@@ -1158,8 +1109,6 @@
  
+@@ -565,32 +414,32 @@
+ #if !defined (_CORBA_REPOSITORY___OUT_CH_)
+ #define _CORBA_REPOSITORY___OUT_CH_
+   
+-  class TAO_IFR_Client_Export Repository_out
++  class TAO_IFR_Client_Export CORBA_Repository_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);
++    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:
+-    Repository_ptr &ptr_;
++    CORBA_Repository_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class Container;
++  class CORBA_Container;
+   
+ #if !defined (_CORBA_CONTAINER___PTR_CH_)
+ #define _CORBA_CONTAINER___PTR_CH_
+   
+-  typedef Container *Container_ptr;
++  typedef CORBA_Container *CORBA_Container_ptr;
+   
  #endif /* end #if !defined */
+   
+@@ -598,43 +447,43 @@
+ #if !defined (_CORBA_CONTAINER___VAR_CH_)
+ #define _CORBA_CONTAINER___VAR_CH_
+   
+-  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
++  class TAO_IFR_Client_Export CORBA_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
++    CORBA_Container_var (void); // default constructor
++    CORBA_Container_var (CORBA_Container_ptr p) : ptr_ (p) {}
++    CORBA_Container_var (const CORBA_Container_var &); // copy constructor
++    ~CORBA_Container_var (void); // destructor
+     
+-    Container_var &operator= (Container_ptr);
+-    Container_var &operator= (const Container_var &);
+-    Container_ptr operator-> (void) const;
++    CORBA_Container_var &operator= (CORBA_Container_ptr);
++    CORBA_Container_var &operator= (const CORBA_Container_var &);
++    CORBA_Container_ptr operator-> (void) const;
+     
+-    operator const Container_ptr &() const;
+-    operator Container_ptr &();
++    operator const CORBA_Container_ptr &() const;
++    operator CORBA_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;
++    CORBA_Container_ptr in (void) const;
++    CORBA_Container_ptr &inout (void);
++    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 Container_ptr tao_duplicate (Container_ptr);
+-    static void tao_release (Container_ptr);
+-    static Container_ptr tao_nil (void);
+-    static Container_ptr tao_narrow (
++    static CORBA_Container_ptr tao_duplicate (CORBA_Container_ptr);
++    static void tao_release (CORBA_Container_ptr);
++    static CORBA_Container_ptr tao_nil (void);
++    static CORBA_Container_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    Container_ptr ptr_;
++    CORBA_Container_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    Container_var (const TAO_Base_var &rhs);
+-    Container_var &operator= (const TAO_Base_var &rhs);
++    CORBA_Container_var (const TAO_Base_var &rhs);
++    CORBA_Container_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Contained;
--
  
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+@@ -644,21 +493,21 @@
+ #if !defined (_CORBA_CONTAINER___OUT_CH_)
+ #define _CORBA_CONTAINER___OUT_CH_
+   
+-  class TAO_IFR_Client_Export Container_out
++  class TAO_IFR_Client_Export CORBA_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);
++    CORBA_Container_out (CORBA_Container_ptr &);
++    CORBA_Container_out (CORBA_Container_var &);
++    CORBA_Container_out (const CORBA_Container_out &);
++    CORBA_Container_out &operator= (const CORBA_Container_out &);
++    CORBA_Container_out &operator= (const CORBA_Container_var &);
++    CORBA_Container_out &operator= (CORBA_Container_ptr);
++    operator CORBA_Container_ptr &();
++    CORBA_Container_ptr &ptr (void);
++    CORBA_Container_ptr operator-> (void);
+   
+   private:
+-    Container_ptr &ptr_;
++    CORBA_Container_ptr &ptr_;
+   };
+   
+   
+@@ -668,8 +517,8 @@
+ #if !defined (_CORBA_CONTAINED___PTR_CH_)
+ #define _CORBA_CONTAINED___PTR_CH_
+   
+-  class Contained;
+-  typedef Contained *Contained_ptr;
++  class CORBA_Contained;
++  typedef CORBA_Contained *CORBA_Contained_ptr;
    
-@@ -1310,8 +1259,6 @@
+ #endif /* end #if !defined */
+   
+@@ -677,43 +526,43 @@
+ #if !defined (_CORBA_CONTAINED___VAR_CH_)
+ #define _CORBA_CONTAINED___VAR_CH_
+   
+-  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
++  class TAO_IFR_Client_Export CORBA_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
++    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
+     
+-    Contained_var &operator= (Contained_ptr);
+-    Contained_var &operator= (const Contained_var &);
+-    Contained_ptr operator-> (void) const;
++    CORBA_Contained_var &operator= (CORBA_Contained_ptr);
++    CORBA_Contained_var &operator= (const CORBA_Contained_var &);
++    CORBA_Contained_ptr operator-> (void) const;
+     
+-    operator const Contained_ptr &() const;
+-    operator Contained_ptr &();
++    operator const CORBA_Contained_ptr &() const;
++    operator CORBA_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;
++    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 Contained_ptr tao_duplicate (Contained_ptr);
+-    static void tao_release (Contained_ptr);
+-    static Contained_ptr tao_nil (void);
+-    static Contained_ptr tao_narrow (
++    static CORBA_Contained_ptr tao_duplicate (CORBA_Contained_ptr);
++    static void tao_release (CORBA_Contained_ptr);
++    static CORBA_Contained_ptr tao_nil (void);
++    static CORBA_Contained_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    Contained_ptr ptr_;
++    CORBA_Contained_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    Contained_var (const TAO_Base_var &rhs);
+-    Contained_var &operator= (const TAO_Base_var &rhs);
++    CORBA_Contained_var (const TAO_Base_var &rhs);
++    CORBA_Contained_var &operator= (const TAO_Base_var &rhs);
+   };
+ 
  
+@@ -723,141 +572,129 @@
+ #if !defined (_CORBA_CONTAINED___OUT_CH_)
+ #define _CORBA_CONTAINED___OUT_CH_
+   
+-  class TAO_IFR_Client_Export Contained_out
++  class TAO_IFR_Client_Export CORBA_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);
++    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:
+-    Contained_ptr &ptr_;
++    CORBA_Contained_ptr &ptr_;
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  // *************************************************************
+-  // CORBA::Contained
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_interface/interface_ch.cpp:106
+-  // *************************************************************
+-  
+   
+ #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;
++  // Forward Classes Declaration
++  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 Contained
+-    : public virtual CORBA::IRObject
++  class TAO_IFR_Client_Export CORBA_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 CORBA_Contained_ptr _ptr_type;
++    typedef CORBA_Contained_var _var_type;
+   #endif /* ! __GNUC__ || g++ >= 2.8 */
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ContainedSeq;
--
- class CORBA_ModuleDef;
+     static int _tao_class_id;
+     
+-    // The static operations.
+-    static Contained_ptr _duplicate (Contained_ptr obj);
++    // the static operations
++    static CORBA_Contained_ptr _duplicate (CORBA_Contained_ptr obj);
+     
+-    static Contained_ptr _narrow (
++    static CORBA_Contained_ptr _narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static Contained_ptr _unchecked_narrow (
++
++    static CORBA_Contained_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static Contained_ptr _nil (void)
++
++    static CORBA_Contained_ptr _nil (void)
+       {
+-        return (Contained_ptr)0;
++        return (CORBA_Contained_ptr)0;
+       }
+     
+     static void _tao_any_destructor (void*);
+     
+     virtual char * id (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual void id (
+         const char * id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual char * name (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual void name (
+         const char * name
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual char * version (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual void version (
+         const char * version
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::Container_ptr defined_in (
++    virtual CORBA_Container_ptr defined_in (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual char * absolute_name (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::Repository_ptr containing_repository (
++    virtual CORBA_Repository_ptr containing_repository (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+@@ -874,7 +711,7 @@
  
- #if !defined (_CORBA_MODULEDEF___PTR_CH_)
-@@ -2070,8 +2017,6 @@
+       static void _tao_any_destructor (void*);
+       
+-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
++      CORBA::DefinitionKind kind;
+       CORBA::Any value;
+       
+     };
+@@ -927,60 +764,59 @@
+       void operator= (const Description_var &);
+     };
+     
+-    static ::CORBA::TypeCode_ptr _tc_Description;
++    static CORBA::TypeCode_ptr _tc_Description;
+     
+-    virtual ::CORBA::Contained::Description * describe (
++    virtual CORBA_Contained::Description * describe (
++        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual void move (
+-        CORBA::Container_ptr new_container,
++        CORBA_Container_ptr new_container,
+         const char * new_name,
+         const char * new_version
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual CORBA::Boolean _is_a (
+         const CORBA::Char *type_id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+     virtual void *_tao_QueryInterface (ptr_arith_t type);
+     
+     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:
+-    Contained (int collocated = 0);
++    CORBA_Contained (int collocated = 0);
+     
+-    // These methods travese the inheritance tree and set the
++    // This methods travese the inheritance tree and set the
+     // parents piece of the given class in the right mode
+     virtual void CORBA_Contained_setup_collocation (int collocated);
+     
+-    Contained (
++    CORBA_Contained (
+         TAO_Stub *objref, 
+         CORBA::Boolean _tao_collocated = 0,
+         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 ~Contained (void);
++    virtual ~CORBA_Contained (void);
+   
+   private:
+-    Contained (const Contained &);
+-    void operator= (const Contained &);
++    CORBA_Contained (const CORBA_Contained &);
++    void operator= (const CORBA_Contained &);
+   };
+   
+   // The Proxy Implementations are used by each interface to
+@@ -992,11 +828,11 @@
+   //                    Base Proxy Impl. Declaration
+   //
+   
+-  class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl
+-    : public virtual CORBA::_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_
+         ACE_ENV_ARG_DECL
+@@ -1048,7 +884,7 @@
+         CORBA::SystemException
+       )) = 0;
+     
+-    virtual ::CORBA::Container_ptr defined_in (
++    virtual CORBA_Container_ptr defined_in (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1064,7 +900,7 @@
+         CORBA::SystemException
+       )) = 0;
+     
+-    virtual ::CORBA::Repository_ptr containing_repository (
++    virtual CORBA_Repository_ptr containing_repository (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1072,7 +908,7 @@
+         CORBA::SystemException
+       )) = 0;
+     
+-    virtual ::CORBA::Contained::Description * describe (
++    virtual CORBA_Contained::Description * describe (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1082,7 +918,7 @@
+     
+     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
+         ACE_ENV_ARG_DECL
+@@ -1093,7 +929,7 @@
+     
+     
+   protected:
+-    _TAO_Contained_Proxy_Impl (void);
++    _TAO_CORBA_Contained_Proxy_Impl (void);
+   };
+   
+   //
+@@ -1105,15 +941,15 @@
+   //                Remote Proxy 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 CORBA::_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_
+         ACE_ENV_ARG_DECL
+@@ -1165,7 +1001,7 @@
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::Container_ptr defined_in (
++    virtual CORBA_Container_ptr defined_in (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1181,7 +1017,7 @@
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::Repository_ptr containing_repository (
++    virtual CORBA_Repository_ptr containing_repository (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1189,7 +1025,7 @@
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::Contained::Description * describe (
++    virtual CORBA_Contained::Description * describe (
+         CORBA_Object *_collocated_tao_target_
+         ACE_ENV_ARG_DECL
+       )
+@@ -1199,7 +1035,7 @@
+     
+     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
+         ACE_ENV_ARG_DECL
+@@ -1225,17 +1061,17 @@
+   //                 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 (
+-        Contained *object
++    virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
++    virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
++        CORBA_Contained *object
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+       ) = 0;
+     
+   protected:
+-    _TAO_Contained_Proxy_Broker (void);
++    _TAO_CORBA_Contained_Proxy_Broker (void);
+     
+   };
+   
+@@ -1248,27 +1084,27 @@
+   //                 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 (
+-        Contained *object
++    virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
++        CORBA_Contained *object
+         ACE_ENV_ARG_DECL
+       );
+     
+   private:
+-    _TAO_Contained_Remote_Proxy_Impl remote_proxy_impl_;
++      _TAO_CORBA_Contained_Remote_Proxy_Impl remote_proxy_impl_;
+   
+   public:
+     // 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.
+-    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);
+   };
+   
+   //
+@@ -1278,8 +1114,6 @@
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained;
+-  
+   
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -1296,7 +1130,7 @@
+     _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        Contained* *value,
++          CORBA_Contained* *value,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+@@ -1308,17 +1142,17 @@
+     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
+     
+     // = Accessors.
+-    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 operations.
+-    static Contained **allocbuf (CORBA::ULong nelems);
+-    static void freebuf (Contained **buffer);
++      static CORBA_Contained **allocbuf (CORBA::ULong nelems);
++      static void freebuf (CORBA_Contained **buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see 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;
++      CORBA_Contained* *get_buffer (CORBA::Boolean orphan = 0);
++      const CORBA_Contained* *get_buffer (void) const;
+     virtual void _shrink_buffer (
+         CORBA::ULong nl,
+         CORBA::ULong ol
+@@ -1327,8 +1161,8 @@
+     virtual void _downcast (
+         void* target,
+         CORBA_Object *src
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     virtual CORBA_Object* _upcast (void *src) const;
+   };
+   
+@@ -1340,35 +1174,35 @@
+ #if !defined (_CORBA_CONTAINEDSEQ_CH_)
+ #define _CORBA_CONTAINEDSEQ_CH_
+   
+-  class ContainedSeq;
+-  class ContainedSeq_var;
++    class CORBA_ContainedSeq;
++    class CORBA_ContainedSeq_var;
+   
+   // *************************************************************
+-  // ContainedSeq
++    // CORBA_ContainedSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export ContainedSeq : public 
++    class TAO_IFR_Client_Export CORBA_ContainedSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Object_Sequence<Contained,Contained_var>
++    TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    ContainedSeq (void); // default ctor
+-    ContainedSeq (CORBA::ULong max); // uses max size
+-    ContainedSeq (
++      CORBA_ContainedSeq (void); // default ctor
++      CORBA_ContainedSeq (CORBA::ULong max); // uses max size
++      CORBA_ContainedSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        Contained_ptr *buffer, 
++          CORBA_Contained_ptr *buffer,
+         CORBA::Boolean release = 0
+       );
+-    ContainedSeq (const ContainedSeq &); // copy ctor
+-    ~ContainedSeq (void);
++      CORBA_ContainedSeq (const CORBA_ContainedSeq &); // copy ctor
++      ~CORBA_ContainedSeq (void);
+     static void _tao_any_destructor (void*);
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef ContainedSeq_var _var_type;
++      typedef CORBA_ContainedSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -1381,38 +1215,38 @@
+ #define _CORBA_CONTAINEDSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::ContainedSeq_var
++    // class CORBA_ContainedSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export ContainedSeq_var
++    class TAO_IFR_Client_Export CORBA_ContainedSeq_var
+   {
+   public:
+-    ContainedSeq_var (void);
+-    ContainedSeq_var (ContainedSeq *);
+-    ContainedSeq_var (const ContainedSeq_var &);
+-    ~ContainedSeq_var (void);
++      CORBA_ContainedSeq_var (void);
++      CORBA_ContainedSeq_var (CORBA_ContainedSeq *);
++      CORBA_ContainedSeq_var (const CORBA_ContainedSeq_var &);
++      ~CORBA_ContainedSeq_var (void);
+     
+-    ContainedSeq_var &operator= (ContainedSeq *);
+-    ContainedSeq_var &operator= (const ContainedSeq_var &);
+-    ContainedSeq *operator-> (void);
+-    const ContainedSeq *operator-> (void) const;
++      CORBA_ContainedSeq_var &operator= (CORBA_ContainedSeq *);
++      CORBA_ContainedSeq_var &operator= (const CORBA_ContainedSeq_var &);
++      CORBA_ContainedSeq *operator-> (void);
++      const CORBA_ContainedSeq *operator-> (void) const;
+     
+-    operator const ContainedSeq &() const;
+-    operator ContainedSeq &();
+-    operator ContainedSeq &() const;
+-    operator ContainedSeq *&(); // variable-size base types only
++      operator const CORBA_ContainedSeq &() const;
++      operator CORBA_ContainedSeq &();
++      operator CORBA_ContainedSeq &() const;
++      operator CORBA_ContainedSeq *&(); // variable-size base types only
+     
+-    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
++      TAO_Object_Manager<CORBA_Contained, CORBA_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 CORBA_ContainedSeq &in (void) const;
++      CORBA_ContainedSeq &inout (void);
++      CORBA_ContainedSeq *&out (void);
++      CORBA_ContainedSeq *_retn (void);
++      CORBA_ContainedSeq *ptr (void) const;
+   
+   private:
+-    ContainedSeq *ptr_;
++      CORBA_ContainedSeq *ptr_;
+   };
+   
+   
+@@ -1422,36 +1256,34 @@
+ #if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
+ #define _CORBA_CONTAINEDSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ContainedSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_ContainedSeq_out (CORBA_ContainedSeq *&);
++      CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &);
++      CORBA_ContainedSeq_out (const CORBA_ContainedSeq_out &);
++      CORBA_ContainedSeq_out &operator= (const CORBA_ContainedSeq_out &);
++      CORBA_ContainedSeq_out &operator= (CORBA_ContainedSeq *);
++      operator CORBA_ContainedSeq *&();
++      CORBA_ContainedSeq *&ptr (void);
++      CORBA_ContainedSeq *operator-> (void);
++      TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
+   
+   private:
+-    ContainedSeq *&ptr_;
++      CORBA_ContainedSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const ContainedSeq_var &);
++      void operator= (const CORBA_ContainedSeq_var &);
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
+-  
+-  class ModuleDef;
++    class CORBA_ModuleDef;
+   
+ #if !defined (_CORBA_MODULEDEF___PTR_CH_)
+ #define _CORBA_MODULEDEF___PTR_CH_
+   
+-  typedef ModuleDef *ModuleDef_ptr;
++    typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1459,43 +1291,43 @@
+ #if !defined (_CORBA_MODULEDEF___VAR_CH_)
+ #define _CORBA_MODULEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    ModuleDef_var &operator= (ModuleDef_ptr);
+-    ModuleDef_var &operator= (const ModuleDef_var &);
+-    ModuleDef_ptr operator-> (void) const;
++      CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
++      CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
++      CORBA_ModuleDef_ptr operator-> (void) const;
+     
+-    operator const ModuleDef_ptr &() const;
+-    operator ModuleDef_ptr &();
++      operator const CORBA_ModuleDef_ptr &() const;
++      operator CORBA_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;
++      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 ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
+-    static void tao_release (ModuleDef_ptr);
+-    static ModuleDef_ptr tao_nil (void);
+-    static ModuleDef_ptr tao_narrow (
++      static CORBA_ModuleDef_ptr tao_duplicate (CORBA_ModuleDef_ptr);
++      static void tao_release (CORBA_ModuleDef_ptr);
++      static CORBA_ModuleDef_ptr tao_nil (void);
++      static CORBA_ModuleDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    ModuleDef_ptr ptr_;
++      CORBA_ModuleDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    ModuleDef_var (const TAO_Base_var &rhs);
+-    ModuleDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_ModuleDef_var (const TAO_Base_var &rhs);
++      CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InterfaceDefSeq;
--
- class CORBA_ExceptionDef;
  
- #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
-@@ -2450,8 +2395,6 @@
+@@ -1505,32 +1337,32 @@
+ #if !defined (_CORBA_MODULEDEF___OUT_CH_)
+ #define _CORBA_MODULEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ModuleDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ModuleDef_ptr &ptr_;
++      CORBA_ModuleDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class ConstantDef;
++    class CORBA_ConstantDef;
+   
+ #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
+ #define _CORBA_CONSTANTDEF___PTR_CH_
+   
+-  typedef ConstantDef *ConstantDef_ptr;
++    typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1538,43 +1370,43 @@
+ #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
+ #define _CORBA_CONSTANTDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    ConstantDef_var &operator= (ConstantDef_ptr);
+-    ConstantDef_var &operator= (const ConstantDef_var &);
+-    ConstantDef_ptr operator-> (void) const;
++      CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
++      CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
++      CORBA_ConstantDef_ptr operator-> (void) const;
+     
+-    operator const ConstantDef_ptr &() const;
+-    operator ConstantDef_ptr &();
++      operator const CORBA_ConstantDef_ptr &() const;
++      operator CORBA_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;
++      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 ConstantDef_ptr tao_duplicate (ConstantDef_ptr);
+-    static void tao_release (ConstantDef_ptr);
+-    static ConstantDef_ptr tao_nil (void);
+-    static ConstantDef_ptr tao_narrow (
++      static CORBA_ConstantDef_ptr tao_duplicate (CORBA_ConstantDef_ptr);
++      static void tao_release (CORBA_ConstantDef_ptr);
++      static CORBA_ConstantDef_ptr tao_nil (void);
++      static CORBA_ConstantDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    ConstantDef_ptr ptr_;
++      CORBA_ConstantDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    ConstantDef_var (const TAO_Base_var &rhs);
+-    ConstantDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_ConstantDef_var (const TAO_Base_var &rhs);
++      CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
+   };
+ 
  
+@@ -1584,32 +1416,32 @@
+ #if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
+ #define _CORBA_CONSTANTDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ConstantDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ConstantDef_ptr &ptr_;
++      CORBA_ConstantDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class IDLType;
++    class CORBA_IDLType;
+   
+ #if !defined (_CORBA_IDLTYPE___PTR_CH_)
+ #define _CORBA_IDLTYPE___PTR_CH_
+   
+-  typedef IDLType *IDLType_ptr;
++    typedef CORBA_IDLType *CORBA_IDLType_ptr;
+   
  #endif /* end #if !defined */
+   
+@@ -1617,43 +1449,43 @@
+ #if !defined (_CORBA_IDLTYPE___VAR_CH_)
+ #define _CORBA_IDLTYPE___VAR_CH_
+   
+-  class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      CORBA_IDLType_var (void); // default constructor
++      CORBA_IDLType_var (CORBA_IDLType_ptr p) : ptr_ (p) {}
++      CORBA_IDLType_var (const CORBA_IDLType_var &); // copy constructor
++      ~CORBA_IDLType_var (void); // destructor
+     
+-    IDLType_var &operator= (IDLType_ptr);
+-    IDLType_var &operator= (const IDLType_var &);
+-    IDLType_ptr operator-> (void) const;
++      CORBA_IDLType_var &operator= (CORBA_IDLType_ptr);
++      CORBA_IDLType_var &operator= (const CORBA_IDLType_var &);
++      CORBA_IDLType_ptr operator-> (void) const;
+     
+-    operator const IDLType_ptr &() const;
+-    operator IDLType_ptr &();
++      operator const CORBA_IDLType_ptr &() const;
++      operator CORBA_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;
++      CORBA_IDLType_ptr in (void) const;
++      CORBA_IDLType_ptr &inout (void);
++      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 IDLType_ptr tao_duplicate (IDLType_ptr);
+-    static void tao_release (IDLType_ptr);
+-    static IDLType_ptr tao_nil (void);
+-    static IDLType_ptr tao_narrow (
++      static CORBA_IDLType_ptr tao_duplicate (CORBA_IDLType_ptr);
++      static void tao_release (CORBA_IDLType_ptr);
++      static CORBA_IDLType_ptr tao_nil (void);
++      static CORBA_IDLType_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    IDLType_ptr ptr_;
++      CORBA_IDLType_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    IDLType_var (const TAO_Base_var &rhs);
+-    IDLType_var &operator= (const TAO_Base_var &rhs);
++      CORBA_IDLType_var (const TAO_Base_var &rhs);
++      CORBA_IDLType_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueDefSeq;
--
- class CORBA_ValueBoxDef;
  
- #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
-@@ -2754,8 +2697,6 @@
+@@ -1663,32 +1495,32 @@
+ #if !defined (_CORBA_IDLTYPE___OUT_CH_)
+ #define _CORBA_IDLTYPE___OUT_CH_
+   
+-  class TAO_IFR_Client_Export IDLType_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_IDLType_out (CORBA_IDLType_ptr &);
++      CORBA_IDLType_out (CORBA_IDLType_var &);
++      CORBA_IDLType_out (const CORBA_IDLType_out &);
++      CORBA_IDLType_out &operator= (const CORBA_IDLType_out &);
++      CORBA_IDLType_out &operator= (const CORBA_IDLType_var &);
++      CORBA_IDLType_out &operator= (CORBA_IDLType_ptr);
++      operator CORBA_IDLType_ptr &();
++      CORBA_IDLType_ptr &ptr (void);
++      CORBA_IDLType_ptr operator-> (void);
+   
+   private:
+-    IDLType_ptr &ptr_;
++      CORBA_IDLType_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class StructDef;
++    class CORBA_StructDef;
+   
+ #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
+ #define _CORBA_STRUCTDEF___PTR_CH_
+   
+-  typedef StructDef *StructDef_ptr;
++    typedef CORBA_StructDef *CORBA_StructDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1696,43 +1528,43 @@
+ #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
+ #define _CORBA_STRUCTDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    StructDef_var &operator= (StructDef_ptr);
+-    StructDef_var &operator= (const StructDef_var &);
+-    StructDef_ptr operator-> (void) const;
++      CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
++      CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
++      CORBA_StructDef_ptr operator-> (void) const;
+     
+-    operator const StructDef_ptr &() const;
+-    operator StructDef_ptr &();
++      operator const CORBA_StructDef_ptr &() const;
++      operator CORBA_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;
++      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 StructDef_ptr tao_duplicate (StructDef_ptr);
+-    static void tao_release (StructDef_ptr);
+-    static StructDef_ptr tao_nil (void);
+-    static StructDef_ptr tao_narrow (
++      static CORBA_StructDef_ptr tao_duplicate (CORBA_StructDef_ptr);
++      static void tao_release (CORBA_StructDef_ptr);
++      static CORBA_StructDef_ptr tao_nil (void);
++      static CORBA_StructDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    StructDef_ptr ptr_;
++      CORBA_StructDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    StructDef_var (const TAO_Base_var &rhs);
+-    StructDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_StructDef_var (const TAO_Base_var &rhs);
++      CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
+ 
+@@ -1742,32 +1574,32 @@
+ #if !defined (_CORBA_STRUCTDEF___OUT_CH_)
+ #define _CORBA_STRUCTDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export StructDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    StructDef_ptr &ptr_;
++      CORBA_StructDef_ptr &ptr_;
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  class UnionDef;
++    class CORBA_UnionDef;
+   
+ #if !defined (_CORBA_UNIONDEF___PTR_CH_)
+ #define _CORBA_UNIONDEF___PTR_CH_
+   
+-  typedef UnionDef *UnionDef_ptr;
++    typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1775,43 +1607,43 @@
+ #if !defined (_CORBA_UNIONDEF___VAR_CH_)
+ #define _CORBA_UNIONDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    UnionDef_var &operator= (UnionDef_ptr);
+-    UnionDef_var &operator= (const UnionDef_var &);
+-    UnionDef_ptr operator-> (void) const;
++      CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
++      CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
++      CORBA_UnionDef_ptr operator-> (void) const;
+     
+-    operator const UnionDef_ptr &() const;
+-    operator UnionDef_ptr &();
++      operator const CORBA_UnionDef_ptr &() const;
++      operator CORBA_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;
++      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 UnionDef_ptr tao_duplicate (UnionDef_ptr);
+-    static void tao_release (UnionDef_ptr);
+-    static UnionDef_ptr tao_nil (void);
+-    static UnionDef_ptr tao_narrow (
++      static CORBA_UnionDef_ptr tao_duplicate (CORBA_UnionDef_ptr);
++      static void tao_release (CORBA_UnionDef_ptr);
++      static CORBA_UnionDef_ptr tao_nil (void);
++      static CORBA_UnionDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    UnionDef_ptr ptr_;
++      CORBA_UnionDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    UnionDef_var (const TAO_Base_var &rhs);
+-    UnionDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_UnionDef_var (const TAO_Base_var &rhs);
++      CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AbstractInterfaceDefSeq;
--
- class CORBA_LocalInterfaceDef;
  
- #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
-@@ -2982,8 +2923,6 @@
+@@ -1821,32 +1653,32 @@
+ #if !defined (_CORBA_UNIONDEF___OUT_CH_)
+ #define _CORBA_UNIONDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export UnionDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    UnionDef_ptr &ptr_;
++      CORBA_UnionDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class EnumDef;
++    class CORBA_EnumDef;
+   
+ #if !defined (_CORBA_ENUMDEF___PTR_CH_)
+ #define _CORBA_ENUMDEF___PTR_CH_
+   
+-  typedef EnumDef *EnumDef_ptr;
++    typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1854,43 +1686,43 @@
+ #if !defined (_CORBA_ENUMDEF___VAR_CH_)
+ #define _CORBA_ENUMDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    EnumDef_var &operator= (EnumDef_ptr);
+-    EnumDef_var &operator= (const EnumDef_var &);
+-    EnumDef_ptr operator-> (void) const;
++      CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
++      CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
++      CORBA_EnumDef_ptr operator-> (void) const;
+     
+-    operator const EnumDef_ptr &() const;
+-    operator EnumDef_ptr &();
++      operator const CORBA_EnumDef_ptr &() const;
++      operator CORBA_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;
++      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 EnumDef_ptr tao_duplicate (EnumDef_ptr);
+-    static void tao_release (EnumDef_ptr);
+-    static EnumDef_ptr tao_nil (void);
+-    static EnumDef_ptr tao_narrow (
++      static CORBA_EnumDef_ptr tao_duplicate (CORBA_EnumDef_ptr);
++      static void tao_release (CORBA_EnumDef_ptr);
++      static CORBA_EnumDef_ptr tao_nil (void);
++      static CORBA_EnumDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    EnumDef_ptr ptr_;
++      CORBA_EnumDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    EnumDef_var (const TAO_Base_var &rhs);
+-    EnumDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_EnumDef_var (const TAO_Base_var &rhs);
++      CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
+   };
+ 
  
+@@ -1900,32 +1732,32 @@
+ #if !defined (_CORBA_ENUMDEF___OUT_CH_)
+ #define _CORBA_ENUMDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export EnumDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    EnumDef_ptr &ptr_;
++      CORBA_EnumDef_ptr &ptr_;
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  class AliasDef;
++    class CORBA_AliasDef;
+   
+ #if !defined (_CORBA_ALIASDEF___PTR_CH_)
+ #define _CORBA_ALIASDEF___PTR_CH_
+   
+-  typedef AliasDef *AliasDef_ptr;
++    typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -1933,43 +1765,43 @@
+ #if !defined (_CORBA_ALIASDEF___VAR_CH_)
+ #define _CORBA_ALIASDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    AliasDef_var &operator= (AliasDef_ptr);
+-    AliasDef_var &operator= (const AliasDef_var &);
+-    AliasDef_ptr operator-> (void) const;
++      CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
++      CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
++      CORBA_AliasDef_ptr operator-> (void) const;
+     
+-    operator const AliasDef_ptr &() const;
+-    operator AliasDef_ptr &();
++      operator const CORBA_AliasDef_ptr &() const;
++      operator CORBA_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;
++      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 AliasDef_ptr tao_duplicate (AliasDef_ptr);
+-    static void tao_release (AliasDef_ptr);
+-    static AliasDef_ptr tao_nil (void);
+-    static AliasDef_ptr tao_narrow (
++      static CORBA_AliasDef_ptr tao_duplicate (CORBA_AliasDef_ptr);
++      static void tao_release (CORBA_AliasDef_ptr);
++      static CORBA_AliasDef_ptr tao_nil (void);
++      static CORBA_AliasDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    AliasDef_ptr ptr_;
++      CORBA_AliasDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    AliasDef_var (const TAO_Base_var &rhs);
+-    AliasDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_AliasDef_var (const TAO_Base_var &rhs);
++      CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_LocalInterfaceDefSeq;
--
- struct CORBA_StructMember;
- class CORBA_StructMember_var;
  
-@@ -3048,8 +2987,6 @@
-   void operator= (const CORBA_StructMember_var &);
- };
+@@ -1979,32 +1811,32 @@
+ #if !defined (_CORBA_ALIASDEF___OUT_CH_)
+ #define _CORBA_ALIASDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export AliasDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    AliasDef_ptr &ptr_;
++      CORBA_AliasDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class InterfaceDef;
++    class CORBA_InterfaceDef;
+   
+ #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
+ #define _CORBA_INTERFACEDEF___PTR_CH_
+   
+-  typedef InterfaceDef *InterfaceDef_ptr;
++    typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2012,43 +1844,43 @@
+ #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
+ #define _CORBA_INTERFACEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    InterfaceDef_var &operator= (InterfaceDef_ptr);
+-    InterfaceDef_var &operator= (const InterfaceDef_var &);
+-    InterfaceDef_ptr operator-> (void) const;
++      CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
++      CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
++      CORBA_InterfaceDef_ptr operator-> (void) const;
+     
+-    operator const InterfaceDef_ptr &() const;
+-    operator InterfaceDef_ptr &();
++      operator const CORBA_InterfaceDef_ptr &() const;
++      operator CORBA_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;
++      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 InterfaceDef_ptr tao_duplicate (InterfaceDef_ptr);
+-    static void tao_release (InterfaceDef_ptr);
+-    static InterfaceDef_ptr tao_nil (void);
+-    static InterfaceDef_ptr tao_narrow (
++      static CORBA_InterfaceDef_ptr tao_duplicate (CORBA_InterfaceDef_ptr);
++      static void tao_release (CORBA_InterfaceDef_ptr);
++      static CORBA_InterfaceDef_ptr tao_nil (void);
++      static CORBA_InterfaceDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    InterfaceDef_ptr ptr_;
++      CORBA_InterfaceDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    InterfaceDef_var (const TAO_Base_var &rhs);
+-    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
++      CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StructMember;
--
  
+@@ -2058,21 +1890,21 @@
+ #if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
+ #define _CORBA_INTERFACEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export InterfaceDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    InterfaceDef_ptr &ptr_;
++      CORBA_InterfaceDef_ptr &ptr_;
+   };
+   
+   
+@@ -2094,7 +1926,7 @@
+     _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        InterfaceDef* *value,
++          CORBA_InterfaceDef* *value,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
+@@ -2106,17 +1938,17 @@
+     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
+     
+     // = Accessors.
+-    TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> operator[] (CORBA::ULong index) const;
++      TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index) const;
+     
+     // = Static operations.
+-    static InterfaceDef **allocbuf (CORBA::ULong nelems);
+-    static void freebuf (InterfaceDef **buffer);
++      static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
++      static void freebuf (CORBA_InterfaceDef **buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see 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;
++      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
+@@ -2125,8 +1957,8 @@
+     virtual void _downcast (
+         void* target,
+         CORBA_Object *src
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     virtual CORBA_Object* _upcast (void *src) const;
+   };
+   
+@@ -2138,35 +1970,35 @@
+ #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
+ #define _CORBA_INTERFACEDEFSEQ_CH_
+   
+-  class InterfaceDefSeq;
+-  class InterfaceDefSeq_var;
++    class CORBA_InterfaceDefSeq;
++    class CORBA_InterfaceDefSeq_var;
+   
+   // *************************************************************
+-  // InterfaceDefSeq
++    // CORBA_InterfaceDefSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export InterfaceDefSeq : public 
++    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<InterfaceDef,InterfaceDef_var>
++    TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    InterfaceDefSeq (void); // default ctor
+-    InterfaceDefSeq (CORBA::ULong max); // uses max size
+-    InterfaceDefSeq (
++      CORBA_InterfaceDefSeq (void); // default ctor
++      CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
++      CORBA_InterfaceDefSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        InterfaceDef_ptr *buffer, 
++          CORBA_InterfaceDef_ptr *buffer,
+         CORBA::Boolean release = 0
+       );
+-    InterfaceDefSeq (const InterfaceDefSeq &); // copy ctor
+-    ~InterfaceDefSeq (void);
++      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 InterfaceDefSeq_var _var_type;
++      typedef CORBA_InterfaceDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -2179,38 +2011,38 @@
+ #define _CORBA_INTERFACEDEFSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::InterfaceDefSeq_var
++    // class CORBA_InterfaceDefSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export InterfaceDefSeq_var
++    class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_var
+   {
+   public:
+-    InterfaceDefSeq_var (void);
+-    InterfaceDefSeq_var (InterfaceDefSeq *);
+-    InterfaceDefSeq_var (const InterfaceDefSeq_var &);
+-    ~InterfaceDefSeq_var (void);
++      CORBA_InterfaceDefSeq_var (void);
++      CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
++      CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &);
++      ~CORBA_InterfaceDefSeq_var (void);
+     
+-    InterfaceDefSeq_var &operator= (InterfaceDefSeq *);
+-    InterfaceDefSeq_var &operator= (const InterfaceDefSeq_var &);
+-    InterfaceDefSeq *operator-> (void);
+-    const InterfaceDefSeq *operator-> (void) const;
++      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 InterfaceDefSeq &() const;
+-    operator InterfaceDefSeq &();
+-    operator InterfaceDefSeq &() const;
+-    operator InterfaceDefSeq *&(); // variable-size base types only
++      operator const CORBA_InterfaceDefSeq &() const;
++      operator CORBA_InterfaceDefSeq &();
++      operator CORBA_InterfaceDefSeq &() const;
++      operator CORBA_InterfaceDefSeq *&(); // variable-size base types only
+     
+-    TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
++      TAO_Object_Manager<CORBA_InterfaceDef, CORBA_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 CORBA_InterfaceDefSeq &in (void) const;
++      CORBA_InterfaceDefSeq &inout (void);
++      CORBA_InterfaceDefSeq *&out (void);
++      CORBA_InterfaceDefSeq *_retn (void);
++      CORBA_InterfaceDefSeq *ptr (void) const;
    
-@@ -3200,8 +3137,6 @@
+   private:
+-    InterfaceDefSeq *ptr_;
++      CORBA_InterfaceDefSeq *ptr_;
+   };
+   
+   
+@@ -2220,36 +2052,34 @@
+ #if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
+ #define _CORBA_INTERFACEDEFSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export InterfaceDefSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    InterfaceDefSeq *&ptr_;
++      CORBA_InterfaceDefSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const InterfaceDefSeq_var &);
++      void operator= (const CORBA_InterfaceDefSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
+-  
+-  class ExceptionDef;
++    class CORBA_ExceptionDef;
+   
+ #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
+ #define _CORBA_EXCEPTIONDEF___PTR_CH_
+   
+-  typedef ExceptionDef *ExceptionDef_ptr;
++    typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2257,43 +2087,43 @@
+ #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
+ #define _CORBA_EXCEPTIONDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    ExceptionDef_var &operator= (ExceptionDef_ptr);
+-    ExceptionDef_var &operator= (const ExceptionDef_var &);
+-    ExceptionDef_ptr operator-> (void) const;
++      CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
++      CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
++      CORBA_ExceptionDef_ptr operator-> (void) const;
+     
+-    operator const ExceptionDef_ptr &() const;
+-    operator ExceptionDef_ptr &();
++      operator const CORBA_ExceptionDef_ptr &() const;
++      operator CORBA_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;
++      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 ExceptionDef_ptr tao_duplicate (ExceptionDef_ptr);
+-    static void tao_release (ExceptionDef_ptr);
+-    static ExceptionDef_ptr tao_nil (void);
+-    static ExceptionDef_ptr tao_narrow (
++      static CORBA_ExceptionDef_ptr tao_duplicate (CORBA_ExceptionDef_ptr);
++      static void tao_release (CORBA_ExceptionDef_ptr);
++      static CORBA_ExceptionDef_ptr tao_nil (void);
++      static CORBA_ExceptionDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    ExceptionDef_ptr ptr_;
++      CORBA_ExceptionDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    ExceptionDef_var (const TAO_Base_var &rhs);
+-    ExceptionDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
++      CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
+ 
+@@ -2303,32 +2133,32 @@
+ #if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
+ #define _CORBA_EXCEPTIONDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ExceptionDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ExceptionDef_ptr &ptr_;
++      CORBA_ExceptionDef_ptr &ptr_;
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  class NativeDef;
++    class CORBA_NativeDef;
+   
+ #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
+ #define _CORBA_NATIVEDEF___PTR_CH_
+   
+-  typedef NativeDef *NativeDef_ptr;
++    typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2336,43 +2166,43 @@
+ #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
+ #define _CORBA_NATIVEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    NativeDef_var &operator= (NativeDef_ptr);
+-    NativeDef_var &operator= (const NativeDef_var &);
+-    NativeDef_ptr operator-> (void) const;
++      CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
++      CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
++      CORBA_NativeDef_ptr operator-> (void) const;
+     
+-    operator const NativeDef_ptr &() const;
+-    operator NativeDef_ptr &();
++      operator const CORBA_NativeDef_ptr &() const;
++      operator CORBA_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;
++      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 NativeDef_ptr tao_duplicate (NativeDef_ptr);
+-    static void tao_release (NativeDef_ptr);
+-    static NativeDef_ptr tao_nil (void);
+-    static NativeDef_ptr tao_narrow (
++      static CORBA_NativeDef_ptr tao_duplicate (CORBA_NativeDef_ptr);
++      static void tao_release (CORBA_NativeDef_ptr);
++      static CORBA_NativeDef_ptr tao_nil (void);
++      static CORBA_NativeDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    NativeDef_ptr ptr_;
++      CORBA_NativeDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    NativeDef_var (const TAO_Base_var &rhs);
+-    NativeDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_NativeDef_var (const TAO_Base_var &rhs);
++      CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StructMemberSeq;
--
- struct CORBA_Initializer;
- class CORBA_Initializer_var;
  
-@@ -3265,8 +3200,6 @@
-   void operator= (const CORBA_Initializer_var &);
- };
+@@ -2382,32 +2212,32 @@
+ #if !defined (_CORBA_NATIVEDEF___OUT_CH_)
+ #define _CORBA_NATIVEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export NativeDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    NativeDef_ptr &ptr_;
++      CORBA_NativeDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class ValueDef;
++    class CORBA_ValueDef;
+   
+ #if !defined (_CORBA_VALUEDEF___PTR_CH_)
+ #define _CORBA_VALUEDEF___PTR_CH_
+   
+-  typedef ValueDef *ValueDef_ptr;
++    typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2415,43 +2245,43 @@
+ #if !defined (_CORBA_VALUEDEF___VAR_CH_)
+ #define _CORBA_VALUEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    ValueDef_var &operator= (ValueDef_ptr);
+-    ValueDef_var &operator= (const ValueDef_var &);
+-    ValueDef_ptr operator-> (void) const;
++      CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
++      CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
++      CORBA_ValueDef_ptr operator-> (void) const;
+     
+-    operator const ValueDef_ptr &() const;
+-    operator ValueDef_ptr &();
++      operator const CORBA_ValueDef_ptr &() const;
++      operator CORBA_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;
++      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 ValueDef_ptr tao_duplicate (ValueDef_ptr);
+-    static void tao_release (ValueDef_ptr);
+-    static ValueDef_ptr tao_nil (void);
+-    static ValueDef_ptr tao_narrow (
++      static CORBA_ValueDef_ptr tao_duplicate (CORBA_ValueDef_ptr);
++      static void tao_release (CORBA_ValueDef_ptr);
++      static CORBA_ValueDef_ptr tao_nil (void);
++      static CORBA_ValueDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    ValueDef_ptr ptr_;
++      CORBA_ValueDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    ValueDef_var (const TAO_Base_var &rhs);
+-    ValueDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_ValueDef_var (const TAO_Base_var &rhs);
++      CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Initializer;
--
  
+@@ -2461,21 +2291,21 @@
+ #if !defined (_CORBA_VALUEDEF___OUT_CH_)
+ #define _CORBA_VALUEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ValueDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ValueDef_ptr &ptr_;
++      CORBA_ValueDef_ptr &ptr_;
+   };
+   
+   
+@@ -2497,7 +2327,7 @@
+     _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        ValueDef* *value,
++          CORBA_ValueDef* *value,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
+@@ -2509,17 +2339,17 @@
+     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
+     
+     // = Accessors.
+-    TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> operator[] (CORBA::ULong index) const;
++      TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index) const;
+     
+     // = Static operations.
+-    static ValueDef **allocbuf (CORBA::ULong nelems);
+-    static void freebuf (ValueDef **buffer);
++      static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
++      static void freebuf (CORBA_ValueDef **buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see 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;
++      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
+@@ -2528,8 +2358,8 @@
+     virtual void _downcast (
+         void* target,
+         CORBA_Object *src
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     virtual CORBA_Object* _upcast (void *src) const;
+   };
+   
+@@ -2541,35 +2371,35 @@
+ #if !defined (_CORBA_VALUEDEFSEQ_CH_)
+ #define _CORBA_VALUEDEFSEQ_CH_
+   
+-  class ValueDefSeq;
+-  class ValueDefSeq_var;
++    class CORBA_ValueDefSeq;
++    class CORBA_ValueDefSeq_var;
+   
+   // *************************************************************
+-  // ValueDefSeq
++    // CORBA_ValueDefSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export ValueDefSeq : public 
++    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<ValueDef,ValueDef_var>
++    TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    ValueDefSeq (void); // default ctor
+-    ValueDefSeq (CORBA::ULong max); // uses max size
+-    ValueDefSeq (
++      CORBA_ValueDefSeq (void); // default ctor
++      CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
++      CORBA_ValueDefSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        ValueDef_ptr *buffer, 
++          CORBA_ValueDef_ptr *buffer,
+         CORBA::Boolean release = 0
+       );
+-    ValueDefSeq (const ValueDefSeq &); // copy ctor
+-    ~ValueDefSeq (void);
++      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 ValueDefSeq_var _var_type;
++      typedef CORBA_ValueDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -2582,38 +2412,38 @@
+ #define _CORBA_VALUEDEFSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::ValueDefSeq_var
++    // class CORBA_ValueDefSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export ValueDefSeq_var
++    class TAO_IFR_Client_Export CORBA_ValueDefSeq_var
+   {
+   public:
+-    ValueDefSeq_var (void);
+-    ValueDefSeq_var (ValueDefSeq *);
+-    ValueDefSeq_var (const ValueDefSeq_var &);
+-    ~ValueDefSeq_var (void);
++      CORBA_ValueDefSeq_var (void);
++      CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
++      CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &);
++      ~CORBA_ValueDefSeq_var (void);
+     
+-    ValueDefSeq_var &operator= (ValueDefSeq *);
+-    ValueDefSeq_var &operator= (const ValueDefSeq_var &);
+-    ValueDefSeq *operator-> (void);
+-    const ValueDefSeq *operator-> (void) const;
++      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 ValueDefSeq &() const;
+-    operator ValueDefSeq &();
+-    operator ValueDefSeq &() const;
+-    operator ValueDefSeq *&(); // variable-size base types only
++      operator const CORBA_ValueDefSeq &() const;
++      operator CORBA_ValueDefSeq &();
++      operator CORBA_ValueDefSeq &() const;
++      operator CORBA_ValueDefSeq *&(); // variable-size base types only
+     
+-    TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
++      TAO_Object_Manager<CORBA_ValueDef, CORBA_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 CORBA_ValueDefSeq &in (void) const;
++      CORBA_ValueDefSeq &inout (void);
++      CORBA_ValueDefSeq *&out (void);
++      CORBA_ValueDefSeq *_retn (void);
++      CORBA_ValueDefSeq *ptr (void) const;
+   
+   private:
+-    ValueDefSeq *ptr_;
++      CORBA_ValueDefSeq *ptr_;
+   };
+   
+   
+@@ -2623,36 +2453,34 @@
+ #if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
+ #define _CORBA_VALUEDEFSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ValueDefSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ValueDefSeq *&ptr_;
++      CORBA_ValueDefSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const ValueDefSeq_var &);
++      void operator= (const CORBA_ValueDefSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq;
+-  
+-  class ValueBoxDef;
++    class CORBA_ValueBoxDef;
    
-@@ -3417,8 +3350,6 @@
+ #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
+ #define _CORBA_VALUEBOXDEF___PTR_CH_
+   
+-  typedef ValueBoxDef *ValueBoxDef_ptr;
++    typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2660,43 +2488,43 @@
+ #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
+ #define _CORBA_VALUEBOXDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_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
++      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
+     
+-    ValueBoxDef_var &operator= (ValueBoxDef_ptr);
+-    ValueBoxDef_var &operator= (const ValueBoxDef_var &);
+-    ValueBoxDef_ptr operator-> (void) const;
++      CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
++      CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
++      CORBA_ValueBoxDef_ptr operator-> (void) const;
+     
+-    operator const ValueBoxDef_ptr &() const;
+-    operator ValueBoxDef_ptr &();
++      operator const CORBA_ValueBoxDef_ptr &() const;
++      operator CORBA_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;
++      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 ValueBoxDef_ptr tao_duplicate (ValueBoxDef_ptr);
+-    static void tao_release (ValueBoxDef_ptr);
+-    static ValueBoxDef_ptr tao_nil (void);
+-    static ValueBoxDef_ptr tao_narrow (
++      static CORBA_ValueBoxDef_ptr tao_duplicate (CORBA_ValueBoxDef_ptr);
++      static void tao_release (CORBA_ValueBoxDef_ptr);
++      static CORBA_ValueBoxDef_ptr tao_nil (void);
++      static CORBA_ValueBoxDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    ValueBoxDef_ptr ptr_;
++      CORBA_ValueBoxDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    ValueBoxDef_var (const TAO_Base_var &rhs);
+-    ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
++      CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+   };
+ 
  
+@@ -2706,32 +2534,32 @@
+ #if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
+ #define _CORBA_VALUEBOXDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export ValueBoxDef_out
++    class TAO_IFR_Client_Export CORBA_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);
++      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:
+-    ValueBoxDef_ptr &ptr_;
++      CORBA_ValueBoxDef_ptr &ptr_;
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  class AbstractInterfaceDef;
++    class CORBA_AbstractInterfaceDef;
+   
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
+   
+-  typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
++    typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
+   
  #endif /* end #if !defined */
+   
+@@ -2739,43 +2567,43 @@
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export AbstractInterfaceDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
+   {
+   public:
+-    AbstractInterfaceDef_var (void); // default constructor
+-    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
+-    AbstractInterfaceDef_var (const AbstractInterfaceDef_var &); // copy constructor
+-    ~AbstractInterfaceDef_var (void); // destructor
++      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
+     
+-    AbstractInterfaceDef_var &operator= (AbstractInterfaceDef_ptr);
+-    AbstractInterfaceDef_var &operator= (const AbstractInterfaceDef_var &);
+-    AbstractInterfaceDef_ptr operator-> (void) const;
++      CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
++      CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
++      CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
+     
+-    operator const AbstractInterfaceDef_ptr &() const;
+-    operator AbstractInterfaceDef_ptr &();
++      operator const CORBA_AbstractInterfaceDef_ptr &() const;
++      operator CORBA_AbstractInterfaceDef_ptr &();
+     // in, inout, out, _retn 
+-    AbstractInterfaceDef_ptr in (void) const;
+-    AbstractInterfaceDef_ptr &inout (void);
+-    AbstractInterfaceDef_ptr &out (void);
+-    AbstractInterfaceDef_ptr _retn (void);
+-    AbstractInterfaceDef_ptr ptr (void) const;
++      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 AbstractInterfaceDef_ptr tao_duplicate (AbstractInterfaceDef_ptr);
+-    static void tao_release (AbstractInterfaceDef_ptr);
+-    static AbstractInterfaceDef_ptr tao_nil (void);
+-    static AbstractInterfaceDef_ptr tao_narrow (
++      static CORBA_AbstractInterfaceDef_ptr tao_duplicate (CORBA_AbstractInterfaceDef_ptr);
++      static void tao_release (CORBA_AbstractInterfaceDef_ptr);
++      static CORBA_AbstractInterfaceDef_ptr tao_nil (void);
++      static CORBA_AbstractInterfaceDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    AbstractInterfaceDef_ptr ptr_;
++      CORBA_AbstractInterfaceDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+-    AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
++      CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InitializerSeq;
--
- struct CORBA_UnionMember;
- class CORBA_UnionMember_var;
  
-@@ -3484,8 +3415,6 @@
-   void operator= (const CORBA_UnionMember_var &);
- };
+@@ -2785,21 +2613,21 @@
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export AbstractInterfaceDef_out
++    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
+   {
+   public:
+-    AbstractInterfaceDef_out (AbstractInterfaceDef_ptr &);
+-    AbstractInterfaceDef_out (AbstractInterfaceDef_var &);
+-    AbstractInterfaceDef_out (const AbstractInterfaceDef_out &);
+-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_out &);
+-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_var &);
+-    AbstractInterfaceDef_out &operator= (AbstractInterfaceDef_ptr);
+-    operator AbstractInterfaceDef_ptr &();
+-    AbstractInterfaceDef_ptr &ptr (void);
+-    AbstractInterfaceDef_ptr operator-> (void);
++      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:
+-    AbstractInterfaceDef_ptr &ptr_;
++      CORBA_AbstractInterfaceDef_ptr &ptr_;
+   };
+   
+   
+@@ -2821,7 +2649,7 @@
+     _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        AbstractInterfaceDef* *value,
++          CORBA_AbstractInterfaceDef* *value,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
+@@ -2833,17 +2661,17 @@
+     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
+     
+     // = Accessors.
+-    TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
++      TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
+     
+     // = Static operations.
+-    static AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
+-    static void freebuf (AbstractInterfaceDef **buffer);
++      static CORBA_AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
++      static void freebuf (CORBA_AbstractInterfaceDef **buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
+-    AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+-    const AbstractInterfaceDef* *get_buffer (void) const;
++      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
+@@ -2852,8 +2680,8 @@
+     virtual void _downcast (
+         void* target,
+         CORBA_Object *src
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     virtual CORBA_Object* _upcast (void *src) const;
+   };
+   
+@@ -2865,35 +2693,35 @@
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
+   
+-  class AbstractInterfaceDefSeq;
+-  class AbstractInterfaceDefSeq_var;
++    class CORBA_AbstractInterfaceDefSeq;
++    class CORBA_AbstractInterfaceDefSeq_var;
+   
+   // *************************************************************
+-  // AbstractInterfaceDefSeq
++    // CORBA_AbstractInterfaceDefSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq : public 
++    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<AbstractInterfaceDef,AbstractInterfaceDef_var>
++    TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    AbstractInterfaceDefSeq (void); // default ctor
+-    AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
+-    AbstractInterfaceDefSeq (
++      CORBA_AbstractInterfaceDefSeq (void); // default ctor
++      CORBA_AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
++      CORBA_AbstractInterfaceDefSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        AbstractInterfaceDef_ptr *buffer, 
++          CORBA_AbstractInterfaceDef_ptr *buffer,
+         CORBA::Boolean release = 0
+       );
+-    AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &); // copy ctor
+-    ~AbstractInterfaceDefSeq (void);
++      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 AbstractInterfaceDefSeq_var _var_type;
++      typedef CORBA_AbstractInterfaceDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -2906,38 +2734,38 @@
+ #define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::AbstractInterfaceDefSeq_var
++    // class CORBA_AbstractInterfaceDefSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq_var
++    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_var
+   {
+   public:
+-    AbstractInterfaceDefSeq_var (void);
+-    AbstractInterfaceDefSeq_var (AbstractInterfaceDefSeq *);
+-    AbstractInterfaceDefSeq_var (const AbstractInterfaceDefSeq_var &);
+-    ~AbstractInterfaceDefSeq_var (void);
++      CORBA_AbstractInterfaceDefSeq_var (void);
++      CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *);
++      CORBA_AbstractInterfaceDefSeq_var (const CORBA_AbstractInterfaceDefSeq_var &);
++      ~CORBA_AbstractInterfaceDefSeq_var (void);
+     
+-    AbstractInterfaceDefSeq_var &operator= (AbstractInterfaceDefSeq *);
+-    AbstractInterfaceDefSeq_var &operator= (const AbstractInterfaceDefSeq_var &);
+-    AbstractInterfaceDefSeq *operator-> (void);
+-    const AbstractInterfaceDefSeq *operator-> (void) const;
++      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 AbstractInterfaceDefSeq &() const;
+-    operator AbstractInterfaceDefSeq &();
+-    operator AbstractInterfaceDefSeq &() const;
+-    operator AbstractInterfaceDefSeq *&(); // variable-size base types only
++      operator const CORBA_AbstractInterfaceDefSeq &() const;
++      operator CORBA_AbstractInterfaceDefSeq &();
++      operator CORBA_AbstractInterfaceDefSeq &() const;
++      operator CORBA_AbstractInterfaceDefSeq *&(); // variable-size base types only
+     
+-    TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
++      TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+     
+     // in, inout, out, _retn 
+-    const AbstractInterfaceDefSeq &in (void) const;
+-    AbstractInterfaceDefSeq &inout (void);
+-    AbstractInterfaceDefSeq *&out (void);
+-    AbstractInterfaceDefSeq *_retn (void);
+-    AbstractInterfaceDefSeq *ptr (void) const;
++      const CORBA_AbstractInterfaceDefSeq &in (void) const;
++      CORBA_AbstractInterfaceDefSeq &inout (void);
++      CORBA_AbstractInterfaceDefSeq *&out (void);
++      CORBA_AbstractInterfaceDefSeq *_retn (void);
++      CORBA_AbstractInterfaceDefSeq *ptr (void) const;
+   
+   private:
+-    AbstractInterfaceDefSeq *ptr_;
++      CORBA_AbstractInterfaceDefSeq *ptr_;
+   };
+   
+   
+@@ -2947,36 +2775,34 @@
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq_out
++    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_out
+   {
+   public:
+-    AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq *&);
+-    AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq_var &);
+-    AbstractInterfaceDefSeq_out (const AbstractInterfaceDefSeq_out &);
+-    AbstractInterfaceDefSeq_out &operator= (const AbstractInterfaceDefSeq_out &);
+-    AbstractInterfaceDefSeq_out &operator= (AbstractInterfaceDefSeq *);
+-    operator AbstractInterfaceDefSeq *&();
+-    AbstractInterfaceDefSeq *&ptr (void);
+-    AbstractInterfaceDefSeq *operator-> (void);
+-    TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
++      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:
+-    AbstractInterfaceDefSeq *&ptr_;
++      CORBA_AbstractInterfaceDefSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const AbstractInterfaceDefSeq_var &);
++      void operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
+-  
+-  class LocalInterfaceDef;
++    class CORBA_LocalInterfaceDef;
+   
+ #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+ #define _CORBA_LOCALINTERFACEDEF___PTR_CH_
+   
+-  typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
++    typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -2984,43 +2810,43 @@
+ #if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
+ #define _CORBA_LOCALINTERFACEDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export LocalInterfaceDef_var : public TAO_Base_var
++    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
+   {
+   public:
+-    LocalInterfaceDef_var (void); // default constructor
+-    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {} 
+-    LocalInterfaceDef_var (const LocalInterfaceDef_var &); // copy constructor
+-    ~LocalInterfaceDef_var (void); // destructor
++      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
+     
+-    LocalInterfaceDef_var &operator= (LocalInterfaceDef_ptr);
+-    LocalInterfaceDef_var &operator= (const LocalInterfaceDef_var &);
+-    LocalInterfaceDef_ptr operator-> (void) const;
++      CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
++      CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
++      CORBA_LocalInterfaceDef_ptr operator-> (void) const;
+     
+-    operator const LocalInterfaceDef_ptr &() const;
+-    operator LocalInterfaceDef_ptr &();
++      operator const CORBA_LocalInterfaceDef_ptr &() const;
++      operator CORBA_LocalInterfaceDef_ptr &();
+     // in, inout, out, _retn 
+-    LocalInterfaceDef_ptr in (void) const;
+-    LocalInterfaceDef_ptr &inout (void);
+-    LocalInterfaceDef_ptr &out (void);
+-    LocalInterfaceDef_ptr _retn (void);
+-    LocalInterfaceDef_ptr ptr (void) const;
++      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 LocalInterfaceDef_ptr tao_duplicate (LocalInterfaceDef_ptr);
+-    static void tao_release (LocalInterfaceDef_ptr);
+-    static LocalInterfaceDef_ptr tao_nil (void);
+-    static LocalInterfaceDef_ptr tao_narrow (
++      static CORBA_LocalInterfaceDef_ptr tao_duplicate (CORBA_LocalInterfaceDef_ptr);
++      static void tao_release (CORBA_LocalInterfaceDef_ptr);
++      static CORBA_LocalInterfaceDef_ptr tao_nil (void);
++      static CORBA_LocalInterfaceDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    LocalInterfaceDef_ptr ptr_;
++      CORBA_LocalInterfaceDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    LocalInterfaceDef_var (const TAO_Base_var &rhs);
+-    LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
++      CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
++      CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_UnionMember;
--
  
+@@ -3030,21 +2856,21 @@
+ #if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
+ #define _CORBA_LOCALINTERFACEDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export LocalInterfaceDef_out
++    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
+   {
+   public:
+-    LocalInterfaceDef_out (LocalInterfaceDef_ptr &);
+-    LocalInterfaceDef_out (LocalInterfaceDef_var &);
+-    LocalInterfaceDef_out (const LocalInterfaceDef_out &);
+-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_out &);
+-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_var &);
+-    LocalInterfaceDef_out &operator= (LocalInterfaceDef_ptr);
+-    operator LocalInterfaceDef_ptr &();
+-    LocalInterfaceDef_ptr &ptr (void);
+-    LocalInterfaceDef_ptr operator-> (void);
++      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:
+-    LocalInterfaceDef_ptr &ptr_;
++      CORBA_LocalInterfaceDef_ptr &ptr_;
+   };
+   
+   
+@@ -3066,7 +2892,7 @@
+     _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        LocalInterfaceDef* *value,
++          CORBA_LocalInterfaceDef* *value,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
+@@ -3078,17 +2904,17 @@
+     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
+     
+     // = Accessors.
+-    TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
++      TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
+     
+     // = Static operations.
+-    static LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
+-    static void freebuf (LocalInterfaceDef **buffer);
++      static CORBA_LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
++      static void freebuf (CORBA_LocalInterfaceDef **buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
+-    LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+-    const LocalInterfaceDef* *get_buffer (void) const;
++      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
+@@ -3097,8 +2923,8 @@
+     virtual void _downcast (
+         void* target,
+         CORBA_Object *src
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     virtual CORBA_Object* _upcast (void *src) const;
+   };
+   
+@@ -3110,35 +2936,35 @@
+ #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
+ #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
+   
+-  class LocalInterfaceDefSeq;
+-  class LocalInterfaceDefSeq_var;
++    class CORBA_LocalInterfaceDefSeq;
++    class CORBA_LocalInterfaceDefSeq_var;
+   
+   // *************************************************************
+-  // LocalInterfaceDefSeq
++    // CORBA_LocalInterfaceDefSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export LocalInterfaceDefSeq : public 
++    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<LocalInterfaceDef,LocalInterfaceDef_var>
++    TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    LocalInterfaceDefSeq (void); // default ctor
+-    LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
+-    LocalInterfaceDefSeq (
++      CORBA_LocalInterfaceDefSeq (void); // default ctor
++      CORBA_LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
++      CORBA_LocalInterfaceDefSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        LocalInterfaceDef_ptr *buffer, 
++          CORBA_LocalInterfaceDef_ptr *buffer,
+         CORBA::Boolean release = 0
+       );
+-    LocalInterfaceDefSeq (const LocalInterfaceDefSeq &); // copy ctor
+-    ~LocalInterfaceDefSeq (void);
++      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 LocalInterfaceDefSeq_var _var_type;
++      typedef CORBA_LocalInterfaceDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -3151,38 +2977,38 @@
+ #define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::LocalInterfaceDefSeq_var
++    // class CORBA_LocalInterfaceDefSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export LocalInterfaceDefSeq_var
++    class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_var
+   {
+   public:
+-    LocalInterfaceDefSeq_var (void);
+-    LocalInterfaceDefSeq_var (LocalInterfaceDefSeq *);
+-    LocalInterfaceDefSeq_var (const LocalInterfaceDefSeq_var &);
+-    ~LocalInterfaceDefSeq_var (void);
++      CORBA_LocalInterfaceDefSeq_var (void);
++      CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *);
++      CORBA_LocalInterfaceDefSeq_var (const CORBA_LocalInterfaceDefSeq_var &);
++      ~CORBA_LocalInterfaceDefSeq_var (void);
+     
+-    LocalInterfaceDefSeq_var &operator= (LocalInterfaceDefSeq *);
+-    LocalInterfaceDefSeq_var &operator= (const LocalInterfaceDefSeq_var &);
+-    LocalInterfaceDefSeq *operator-> (void);
+-    const LocalInterfaceDefSeq *operator-> (void) const;
++      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 LocalInterfaceDefSeq &() const;
+-    operator LocalInterfaceDefSeq &();
+-    operator LocalInterfaceDefSeq &() const;
+-    operator LocalInterfaceDefSeq *&(); // variable-size base types only
++      operator const CORBA_LocalInterfaceDefSeq &() const;
++      operator CORBA_LocalInterfaceDefSeq &();
++      operator CORBA_LocalInterfaceDefSeq &() const;
++      operator CORBA_LocalInterfaceDefSeq *&(); // variable-size base types only
+     
+-    TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
++      TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+     
+     // in, inout, out, _retn 
+-    const LocalInterfaceDefSeq &in (void) const;
+-    LocalInterfaceDefSeq &inout (void);
+-    LocalInterfaceDefSeq *&out (void);
+-    LocalInterfaceDefSeq *_retn (void);
+-    LocalInterfaceDefSeq *ptr (void) const;
++      const CORBA_LocalInterfaceDefSeq &in (void) const;
++      CORBA_LocalInterfaceDefSeq &inout (void);
++      CORBA_LocalInterfaceDefSeq *&out (void);
++      CORBA_LocalInterfaceDefSeq *_retn (void);
++      CORBA_LocalInterfaceDefSeq *ptr (void) const;
+   
+   private:
+-    LocalInterfaceDefSeq *ptr_;
++      CORBA_LocalInterfaceDefSeq *ptr_;
+   };
+   
+   
+@@ -3192,105 +3018,101 @@
+ #if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
+ #define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export LocalInterfaceDefSeq_out
++    class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_out
+   {
+   public:
+-    LocalInterfaceDefSeq_out (LocalInterfaceDefSeq *&);
+-    LocalInterfaceDefSeq_out (LocalInterfaceDefSeq_var &);
+-    LocalInterfaceDefSeq_out (const LocalInterfaceDefSeq_out &);
+-    LocalInterfaceDefSeq_out &operator= (const LocalInterfaceDefSeq_out &);
+-    LocalInterfaceDefSeq_out &operator= (LocalInterfaceDefSeq *);
+-    operator LocalInterfaceDefSeq *&();
+-    LocalInterfaceDefSeq *&ptr (void);
+-    LocalInterfaceDefSeq *operator-> (void);
+-    TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
++      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);
    
-@@ -3636,8 +3565,6 @@
+   private:
+-    LocalInterfaceDefSeq *&ptr_;
++      CORBA_LocalInterfaceDefSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const LocalInterfaceDefSeq_var &);
++      void operator= (const CORBA_LocalInterfaceDefSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
+-  
+-  struct StructMember;
+-  class StructMember_var;
++    struct CORBA_StructMember;
++    class CORBA_StructMember_var;
+   
+-  struct TAO_IFR_Client_Export StructMember
++    struct TAO_IFR_Client_Export CORBA_StructMember
+   {
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef StructMember_var _var_type;
++      typedef CORBA_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 (CORBA, IDLType_var) type_def;
++      CORBA_IDLType_var type_def;
+     
+   };
+   
+-  class TAO_IFR_Client_Export StructMember_var
++    class TAO_IFR_Client_Export CORBA_StructMember_var
+   {
+   public:
+-    StructMember_var (void);
+-    StructMember_var (StructMember *);
+-    StructMember_var (const StructMember_var &);
+-    ~StructMember_var (void);
++      CORBA_StructMember_var (void);
++      CORBA_StructMember_var (CORBA_StructMember *);
++      CORBA_StructMember_var (const CORBA_StructMember_var &);
++      ~CORBA_StructMember_var (void);
+     
+-    StructMember_var &operator= (StructMember *);
+-    StructMember_var &operator= (const StructMember_var &);
+-    StructMember *operator-> (void);
+-    const StructMember *operator-> (void) const;
++      CORBA_StructMember_var &operator= (CORBA_StructMember *);
++      CORBA_StructMember_var &operator= (const CORBA_StructMember_var &);
++      CORBA_StructMember *operator-> (void);
++      const CORBA_StructMember *operator-> (void) const;
+     
+-    operator const StructMember &() const;
+-    operator StructMember &();
+-    operator StructMember &() const;
++      operator const CORBA_StructMember &() const;
++      operator CORBA_StructMember &();
++      operator CORBA_StructMember &() const;
+     // Variable-size types only.
+-    operator StructMember *&();
++      operator CORBA_StructMember *&();
+     
+     // in, inout, out, _retn 
+-    const StructMember &in (void) const;
+-    StructMember &inout (void);
+-    StructMember *&out (void);
+-    StructMember *_retn (void);
+-    StructMember *ptr (void) const;
++      const CORBA_StructMember &in (void) const;
++      CORBA_StructMember &inout (void);
++      CORBA_StructMember *&out (void);
++      CORBA_StructMember *_retn (void);
++      CORBA_StructMember *ptr (void) const;
+   
+   private:
+-    StructMember *ptr_;
++      CORBA_StructMember *ptr_;
+   };
+   
+-  class TAO_IFR_Client_Export StructMember_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_StructMember_out (CORBA_StructMember *&);
++      CORBA_StructMember_out (CORBA_StructMember_var &);
++      CORBA_StructMember_out (const CORBA_StructMember_out &);
++      CORBA_StructMember_out &operator= (const CORBA_StructMember_out &);
++      CORBA_StructMember_out &operator= (CORBA_StructMember *);
++      operator CORBA_StructMember *&();
++      CORBA_StructMember *&ptr (void);
++      CORBA_StructMember *operator-> (void);
+     
+   private:
+-    StructMember *&ptr_;
++      CORBA_StructMember *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const StructMember_var &);
++      void operator= (const CORBA_StructMember_var &);
+   };
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember;
+-  
+   
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_
+   
+-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+     : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+@@ -3300,7 +3122,7 @@
+     _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        StructMember *data,
++          CORBA_StructMember *data,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
+@@ -3312,22 +3134,22 @@
+     virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
+     
+     // = Accessors.
+-    StructMember &operator[] (CORBA::ULong i);
+-    const StructMember &operator[] (CORBA::ULong i) const;
++      CORBA_StructMember &operator[] (CORBA::ULong i);
++      const CORBA_StructMember &operator[] (CORBA::ULong i) const;
+     
+     // = Static operations.
+-    static StructMember *allocbuf (CORBA::ULong size);
+-    static void freebuf (StructMember *buffer);
++      static CORBA_StructMember *allocbuf (CORBA::ULong size);
++      static void freebuf (CORBA_StructMember *buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
+-    StructMember *get_buffer (CORBA::Boolean orphan = 0);
+-    const StructMember *get_buffer (void) const;
++      CORBA_StructMember *get_buffer (CORBA::Boolean orphan = 0);
++      const CORBA_StructMember *get_buffer (void) const;
+     void replace (
+         CORBA::ULong max,
+         CORBA::ULong length,
+-        StructMember *data,
++          CORBA_StructMember *data,
+         CORBA::Boolean release
+       );
+   };
+@@ -3340,35 +3162,35 @@
+ #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
+ #define _CORBA_STRUCTMEMBERSEQ_CH_
+   
+-  class StructMemberSeq;
+-  class StructMemberSeq_var;
++    class CORBA_StructMemberSeq;
++    class CORBA_StructMemberSeq_var;
+   
+   // *************************************************************
+-  // StructMemberSeq
++    // CORBA_StructMemberSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export StructMemberSeq : public 
++    class TAO_IFR_Client_Export CORBA_StructMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<StructMember>
++    TAO_Unbounded_Sequence<CORBA_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    StructMemberSeq (void); // default ctor
+-    StructMemberSeq (CORBA::ULong max); // uses max size
+-    StructMemberSeq (
++      CORBA_StructMemberSeq (void); // default ctor
++      CORBA_StructMemberSeq (CORBA::ULong max); // uses max size
++      CORBA_StructMemberSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        StructMember *buffer, 
++          CORBA_StructMember *buffer,
+         CORBA::Boolean release = 0
+       );
+-    StructMemberSeq (const StructMemberSeq &); // copy ctor
+-    ~StructMemberSeq (void);
++      CORBA_StructMemberSeq (const CORBA_StructMemberSeq &); // copy ctor
++      ~CORBA_StructMemberSeq (void);
+     static void _tao_any_destructor (void*);
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef StructMemberSeq_var _var_type;
++      typedef CORBA_StructMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -3381,39 +3203,39 @@
+ #define _CORBA_STRUCTMEMBERSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::StructMemberSeq_var
++    // class CORBA_StructMemberSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export StructMemberSeq_var
++    class TAO_IFR_Client_Export CORBA_StructMemberSeq_var
+   {
+   public:
+-    StructMemberSeq_var (void);
+-    StructMemberSeq_var (StructMemberSeq *);
+-    StructMemberSeq_var (const StructMemberSeq_var &);
+-    ~StructMemberSeq_var (void);
+-    
+-    StructMemberSeq_var &operator= (StructMemberSeq *);
+-    StructMemberSeq_var &operator= (const StructMemberSeq_var &);
+-    StructMemberSeq *operator-> (void);
+-    const StructMemberSeq *operator-> (void) const;
+-    
+-    operator const StructMemberSeq &() const;
+-    operator StructMemberSeq &();
+-    operator StructMemberSeq &() const;
+-    operator StructMemberSeq *&(); // variable-size base types only
++      CORBA_StructMemberSeq_var (void);
++      CORBA_StructMemberSeq_var (CORBA_StructMemberSeq *);
++      CORBA_StructMemberSeq_var (const CORBA_StructMemberSeq_var &);
++      ~CORBA_StructMemberSeq_var (void);
++
++      CORBA_StructMemberSeq_var &operator= (CORBA_StructMemberSeq *);
++      CORBA_StructMemberSeq_var &operator= (const CORBA_StructMemberSeq_var &);
++      CORBA_StructMemberSeq *operator-> (void);
++      const CORBA_StructMemberSeq *operator-> (void) const;
++
++      operator const CORBA_StructMemberSeq &() const;
++      operator CORBA_StructMemberSeq &();
++      operator CORBA_StructMemberSeq &() const;
++      operator CORBA_StructMemberSeq *&(); // variable-size base types only
+     
+-    StructMember & operator[] (CORBA::ULong index);
+-    const 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 StructMemberSeq &in (void) const;
+-    StructMemberSeq &inout (void);
+-    StructMemberSeq *&out (void);
+-    StructMemberSeq *_retn (void);
+-    StructMemberSeq *ptr (void) const;
++      const CORBA_StructMemberSeq &in (void) const;
++      CORBA_StructMemberSeq &inout (void);
++      CORBA_StructMemberSeq *&out (void);
++      CORBA_StructMemberSeq *_retn (void);
++      CORBA_StructMemberSeq *ptr (void) const;
+   
+   private:
+-    StructMemberSeq *ptr_;
++      CORBA_StructMemberSeq *ptr_;
+   };
+   
+   
+@@ -3423,104 +3245,100 @@
+ #if !defined (_CORBA_STRUCTMEMBERSEQ___OUT_CH_)
+ #define _CORBA_STRUCTMEMBERSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export StructMemberSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_StructMemberSeq_out (CORBA_StructMemberSeq *&);
++      CORBA_StructMemberSeq_out (CORBA_StructMemberSeq_var &);
++      CORBA_StructMemberSeq_out (const CORBA_StructMemberSeq_out &);
++      CORBA_StructMemberSeq_out &operator= (const CORBA_StructMemberSeq_out &);
++      CORBA_StructMemberSeq_out &operator= (CORBA_StructMemberSeq *);
++      operator CORBA_StructMemberSeq *&();
++      CORBA_StructMemberSeq *&ptr (void);
++      CORBA_StructMemberSeq *operator-> (void);
++      CORBA_StructMember & operator[] (CORBA::ULong index);
+   
+   private:
+-    StructMemberSeq *&ptr_;
++      CORBA_StructMemberSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const StructMemberSeq_var &);
++      void operator= (const CORBA_StructMemberSeq_var &);
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
++    struct CORBA_Initializer;
++    class CORBA_Initializer_var;
+   
+-  struct Initializer;
+-  class Initializer_var;
+-  
+-  struct TAO_IFR_Client_Export Initializer
++    struct TAO_IFR_Client_Export CORBA_Initializer
+   {
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef Initializer_var _var_type;
++      typedef CORBA_Initializer_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_UnionMemberSeq;
--
+     static void _tao_any_destructor (void*);
+     
+-    ACE_NESTED_CLASS (CORBA, StructMemberSeq) members;
++      CORBA_StructMemberSeq members;
+     TAO_String_Manager name;
+     
+   };
+   
+-  class TAO_IFR_Client_Export Initializer_var
++    class TAO_IFR_Client_Export CORBA_Initializer_var
+   {
+   public:
+-    Initializer_var (void);
+-    Initializer_var (Initializer *);
+-    Initializer_var (const Initializer_var &);
+-    ~Initializer_var (void);
+-    
+-    Initializer_var &operator= (Initializer *);
+-    Initializer_var &operator= (const Initializer_var &);
+-    Initializer *operator-> (void);
+-    const Initializer *operator-> (void) const;
+-    
+-    operator const Initializer &() const;
+-    operator Initializer &();
+-    operator Initializer &() const;
++      CORBA_Initializer_var (void);
++      CORBA_Initializer_var (CORBA_Initializer *);
++      CORBA_Initializer_var (const CORBA_Initializer_var &);
++      ~CORBA_Initializer_var (void);
++
++      CORBA_Initializer_var &operator= (CORBA_Initializer *);
++      CORBA_Initializer_var &operator= (const CORBA_Initializer_var &);
++      CORBA_Initializer *operator-> (void);
++      const CORBA_Initializer *operator-> (void) const;
++
++      operator const CORBA_Initializer &() const;
++      operator CORBA_Initializer &();
++      operator CORBA_Initializer &() const;
+     // Variable-size types only.
+-    operator Initializer *&();
++      operator CORBA_Initializer *&();
+     
+     // in, inout, out, _retn 
+-    const Initializer &in (void) const;
+-    Initializer &inout (void);
+-    Initializer *&out (void);
+-    Initializer *_retn (void);
+-    Initializer *ptr (void) const;
++      const CORBA_Initializer &in (void) const;
++      CORBA_Initializer &inout (void);
++      CORBA_Initializer *&out (void);
++      CORBA_Initializer *_retn (void);
++      CORBA_Initializer *ptr (void) const;
+   
+   private:
+-    Initializer *ptr_;
++      CORBA_Initializer *ptr_;
+   };
+   
+-  class TAO_IFR_Client_Export Initializer_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_Initializer_out (CORBA_Initializer *&);
++      CORBA_Initializer_out (CORBA_Initializer_var &);
++      CORBA_Initializer_out (const CORBA_Initializer_out &);
++      CORBA_Initializer_out &operator= (const CORBA_Initializer_out &);
++      CORBA_Initializer_out &operator= (CORBA_Initializer *);
++      operator CORBA_Initializer *&();
++      CORBA_Initializer *&ptr (void);
++      CORBA_Initializer *operator-> (void);
+     
+   private:
+-    Initializer *&ptr_;
++      CORBA_Initializer *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const Initializer_var &);
++      void operator= (const CORBA_Initializer_var &);
+   };
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer;
+-  
+   
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_
+   
+-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_InitializerSeq
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+     : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+@@ -3530,7 +3348,7 @@
+     _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        Initializer *data,
++          CORBA_Initializer *data,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
+@@ -3542,22 +3360,22 @@
+     virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
+     
+     // = Accessors.
+-    Initializer &operator[] (CORBA::ULong i);
+-    const Initializer &operator[] (CORBA::ULong i) const;
++      CORBA_Initializer &operator[] (CORBA::ULong i);
++      const CORBA_Initializer &operator[] (CORBA::ULong i) const;
+     
+     // = Static operations.
+-    static Initializer *allocbuf (CORBA::ULong size);
+-    static void freebuf (Initializer *buffer);
++      static CORBA_Initializer *allocbuf (CORBA::ULong size);
++      static void freebuf (CORBA_Initializer *buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
+-    Initializer *get_buffer (CORBA::Boolean orphan = 0);
+-    const Initializer *get_buffer (void) const;
++      CORBA_Initializer *get_buffer (CORBA::Boolean orphan = 0);
++      const CORBA_Initializer *get_buffer (void) const;
+     void replace (
+         CORBA::ULong max,
+         CORBA::ULong length,
+-        Initializer *data,
++          CORBA_Initializer *data,
+         CORBA::Boolean release
+       );
+   };
+@@ -3570,35 +3388,35 @@
+ #if !defined (_CORBA_INITIALIZERSEQ_CH_)
+ #define _CORBA_INITIALIZERSEQ_CH_
+   
+-  class InitializerSeq;
+-  class InitializerSeq_var;
++    class CORBA_InitializerSeq;
++    class CORBA_InitializerSeq_var;
+   
+   // *************************************************************
+-  // InitializerSeq
++    // CORBA_InitializerSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export InitializerSeq : public 
++    class TAO_IFR_Client_Export CORBA_InitializerSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<Initializer>
++    TAO_Unbounded_Sequence<CORBA_Initializer>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    InitializerSeq (void); // default ctor
+-    InitializerSeq (CORBA::ULong max); // uses max size
+-    InitializerSeq (
++      CORBA_InitializerSeq (void); // default ctor
++      CORBA_InitializerSeq (CORBA::ULong max); // uses max size
++      CORBA_InitializerSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        Initializer *buffer, 
++          CORBA_Initializer *buffer,
+         CORBA::Boolean release = 0
+       );
+-    InitializerSeq (const InitializerSeq &); // copy ctor
+-    ~InitializerSeq (void);
++      CORBA_InitializerSeq (const CORBA_InitializerSeq &); // copy ctor
++      ~CORBA_InitializerSeq (void);
+     static void _tao_any_destructor (void*);
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef InitializerSeq_var _var_type;
++      typedef CORBA_InitializerSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -3611,39 +3429,39 @@
+ #define _CORBA_INITIALIZERSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::InitializerSeq_var
++    // class CORBA_InitializerSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export InitializerSeq_var
++    class TAO_IFR_Client_Export CORBA_InitializerSeq_var
+   {
+   public:
+-    InitializerSeq_var (void);
+-    InitializerSeq_var (InitializerSeq *);
+-    InitializerSeq_var (const InitializerSeq_var &);
+-    ~InitializerSeq_var (void);
+-    
+-    InitializerSeq_var &operator= (InitializerSeq *);
+-    InitializerSeq_var &operator= (const InitializerSeq_var &);
+-    InitializerSeq *operator-> (void);
+-    const InitializerSeq *operator-> (void) const;
+-    
+-    operator const InitializerSeq &() const;
+-    operator InitializerSeq &();
+-    operator InitializerSeq &() const;
+-    operator InitializerSeq *&(); // variable-size base types only
++      CORBA_InitializerSeq_var (void);
++      CORBA_InitializerSeq_var (CORBA_InitializerSeq *);
++      CORBA_InitializerSeq_var (const CORBA_InitializerSeq_var &);
++      ~CORBA_InitializerSeq_var (void);
++
++      CORBA_InitializerSeq_var &operator= (CORBA_InitializerSeq *);
++      CORBA_InitializerSeq_var &operator= (const CORBA_InitializerSeq_var &);
++      CORBA_InitializerSeq *operator-> (void);
++      const CORBA_InitializerSeq *operator-> (void) const;
+     
+-    Initializer & operator[] (CORBA::ULong index);
+-    const Initializer & operator[] (CORBA::ULong index) const;
++      operator const CORBA_InitializerSeq &() const;
++      operator CORBA_InitializerSeq &();
++      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;
+     
+     // in, inout, out, _retn 
+-    const InitializerSeq &in (void) const;
+-    InitializerSeq &inout (void);
+-    InitializerSeq *&out (void);
+-    InitializerSeq *_retn (void);
+-    InitializerSeq *ptr (void) const;
++      const CORBA_InitializerSeq &in (void) const;
++      CORBA_InitializerSeq &inout (void);
++      CORBA_InitializerSeq *&out (void);
++      CORBA_InitializerSeq *_retn (void);
++      CORBA_InitializerSeq *ptr (void) const;
+   
+   private:
+-    InitializerSeq *ptr_;
++      CORBA_InitializerSeq *ptr_;
+   };
+   
+   
+@@ -3653,38 +3471,36 @@
+ #if !defined (_CORBA_INITIALIZERSEQ___OUT_CH_)
+ #define _CORBA_INITIALIZERSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export InitializerSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_InitializerSeq_out (CORBA_InitializerSeq *&);
++      CORBA_InitializerSeq_out (CORBA_InitializerSeq_var &);
++      CORBA_InitializerSeq_out (const CORBA_InitializerSeq_out &);
++      CORBA_InitializerSeq_out &operator= (const CORBA_InitializerSeq_out &);
++      CORBA_InitializerSeq_out &operator= (CORBA_InitializerSeq *);
++      operator CORBA_InitializerSeq *&();
++      CORBA_InitializerSeq *&ptr (void);
++      CORBA_InitializerSeq *operator-> (void);
++      CORBA_Initializer & operator[] (CORBA::ULong index);
+   
+   private:
+-    InitializerSeq *&ptr_;
++      CORBA_InitializerSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const InitializerSeq_var &);
++      void operator= (const CORBA_InitializerSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
+-  
+-  struct UnionMember;
+-  class UnionMember_var;
++    struct CORBA_UnionMember;
++    class CORBA_UnionMember_var;
+   
+-  struct TAO_IFR_Client_Export UnionMember
++    struct TAO_IFR_Client_Export CORBA_UnionMember
+   {
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef UnionMember_var _var_type;
++      typedef CORBA_UnionMember_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
  
+     static void _tao_any_destructor (void*);
+@@ -3692,67 +3508,65 @@
+     TAO_String_Manager name;
+     CORBA::Any label;
+     CORBA::TypeCode_var type;
+-    ACE_NESTED_CLASS (CORBA, IDLType_var) type_def;
++      CORBA_IDLType_var type_def;
+     
+   };
+   
+-  class TAO_IFR_Client_Export UnionMember_var
++    class TAO_IFR_Client_Export CORBA_UnionMember_var
+   {
+   public:
+-    UnionMember_var (void);
+-    UnionMember_var (UnionMember *);
+-    UnionMember_var (const UnionMember_var &);
+-    ~UnionMember_var (void);
++      CORBA_UnionMember_var (void);
++      CORBA_UnionMember_var (CORBA_UnionMember *);
++      CORBA_UnionMember_var (const CORBA_UnionMember_var &);
++      ~CORBA_UnionMember_var (void);
+     
+-    UnionMember_var &operator= (UnionMember *);
+-    UnionMember_var &operator= (const UnionMember_var &);
+-    UnionMember *operator-> (void);
+-    const UnionMember *operator-> (void) const;
++      CORBA_UnionMember_var &operator= (CORBA_UnionMember *);
++      CORBA_UnionMember_var &operator= (const CORBA_UnionMember_var &);
++      CORBA_UnionMember *operator-> (void);
++      const CORBA_UnionMember *operator-> (void) const;
+     
+-    operator const UnionMember &() const;
+-    operator UnionMember &();
+-    operator UnionMember &() const;
++      operator const CORBA_UnionMember &() const;
++      operator CORBA_UnionMember &();
++      operator CORBA_UnionMember &() const;
+     // Variable-size types only.
+-    operator UnionMember *&();
++      operator CORBA_UnionMember *&();
+     
+     // in, inout, out, _retn 
+-    const UnionMember &in (void) const;
+-    UnionMember &inout (void);
+-    UnionMember *&out (void);
+-    UnionMember *_retn (void);
+-    UnionMember *ptr (void) const;
++      const CORBA_UnionMember &in (void) const;
++      CORBA_UnionMember &inout (void);
++      CORBA_UnionMember *&out (void);
++      CORBA_UnionMember *_retn (void);
++      CORBA_UnionMember *ptr (void) const;
+   
+   private:
+-    UnionMember *ptr_;
++      CORBA_UnionMember *ptr_;
+   };
+   
+-  class TAO_IFR_Client_Export UnionMember_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_UnionMember_out (CORBA_UnionMember *&);
++      CORBA_UnionMember_out (CORBA_UnionMember_var &);
++      CORBA_UnionMember_out (const CORBA_UnionMember_out &);
++      CORBA_UnionMember_out &operator= (const CORBA_UnionMember_out &);
++      CORBA_UnionMember_out &operator= (CORBA_UnionMember *);
++      operator CORBA_UnionMember *&();
++      CORBA_UnionMember *&ptr (void);
++      CORBA_UnionMember *operator-> (void);
+     
+   private:
+-    UnionMember *&ptr_;
++      CORBA_UnionMember *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const UnionMember_var &);
++      void operator= (const CORBA_UnionMember_var &);
+   };
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember;
+-  
+   
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_
+   
+-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
++    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+     : public TAO_Unbounded_Base_Sequence
+   {
+   public:
+@@ -3762,7 +3576,7 @@
+     _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
+         CORBA::ULong maximum,
+         CORBA::ULong length,
+-        UnionMember *data,
++          CORBA_UnionMember *data,
+         CORBA::Boolean release = 0
+       );
+     _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
+@@ -3774,22 +3588,22 @@
+     virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
+     
+     // = Accessors.
+-    UnionMember &operator[] (CORBA::ULong i);
+-    const UnionMember &operator[] (CORBA::ULong i) const;
++      CORBA_UnionMember &operator[] (CORBA::ULong i);
++      const CORBA_UnionMember &operator[] (CORBA::ULong i) const;
+     
+     // = Static operations.
+-    static UnionMember *allocbuf (CORBA::ULong size);
+-    static void freebuf (UnionMember *buffer);
++      static CORBA_UnionMember *allocbuf (CORBA::ULong size);
++      static void freebuf (CORBA_UnionMember *buffer);
+     
+     // Implement the TAO_Base_Sequence methods (see Sequence.h)
+     virtual void _allocate_buffer (CORBA::ULong length);
+     virtual void _deallocate_buffer (void);
+-    UnionMember *get_buffer (CORBA::Boolean orphan = 0);
+-    const UnionMember *get_buffer (void) const;
++      CORBA_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
++      const CORBA_UnionMember *get_buffer (void) const;
+     void replace (
+         CORBA::ULong max,
+         CORBA::ULong length,
+-        UnionMember *data,
++          CORBA_UnionMember *data,
+         CORBA::Boolean release
+       );
+   };
+@@ -3802,35 +3616,35 @@
+ #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
+ #define _CORBA_UNIONMEMBERSEQ_CH_
+   
+-  class UnionMemberSeq;
+-  class UnionMemberSeq_var;
++    class CORBA_UnionMemberSeq;
++    class CORBA_UnionMemberSeq_var;
+   
+   // *************************************************************
+-  // UnionMemberSeq
++    // CORBA_UnionMemberSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export UnionMemberSeq : public 
++    class TAO_IFR_Client_Export CORBA_UnionMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<UnionMember>
++    TAO_Unbounded_Sequence<CORBA_UnionMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    UnionMemberSeq (void); // default ctor
+-    UnionMemberSeq (CORBA::ULong max); // uses max size
+-    UnionMemberSeq (
++      CORBA_UnionMemberSeq (void); // default ctor
++      CORBA_UnionMemberSeq (CORBA::ULong max); // uses max size
++      CORBA_UnionMemberSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+-        UnionMember *buffer, 
++          CORBA_UnionMember *buffer,
+         CORBA::Boolean release = 0
+       );
+-    UnionMemberSeq (const UnionMemberSeq &); // copy ctor
+-    ~UnionMemberSeq (void);
++      CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &); // copy ctor
++      ~CORBA_UnionMemberSeq (void);
+     static void _tao_any_destructor (void*);
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef UnionMemberSeq_var _var_type;
++      typedef CORBA_UnionMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -3843,39 +3657,39 @@
+ #define _CORBA_UNIONMEMBERSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::UnionMemberSeq_var
++    // class CORBA_UnionMemberSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export UnionMemberSeq_var
++    class TAO_IFR_Client_Export CORBA_UnionMemberSeq_var
+   {
+   public:
+-    UnionMemberSeq_var (void);
+-    UnionMemberSeq_var (UnionMemberSeq *);
+-    UnionMemberSeq_var (const UnionMemberSeq_var &);
+-    ~UnionMemberSeq_var (void);
+-    
+-    UnionMemberSeq_var &operator= (UnionMemberSeq *);
+-    UnionMemberSeq_var &operator= (const UnionMemberSeq_var &);
+-    UnionMemberSeq *operator-> (void);
+-    const UnionMemberSeq *operator-> (void) const;
+-    
+-    operator const UnionMemberSeq &() const;
+-    operator UnionMemberSeq &();
+-    operator UnionMemberSeq &() const;
+-    operator UnionMemberSeq *&(); // variable-size base types only
++      CORBA_UnionMemberSeq_var (void);
++      CORBA_UnionMemberSeq_var (CORBA_UnionMemberSeq *);
++      CORBA_UnionMemberSeq_var (const CORBA_UnionMemberSeq_var &);
++      ~CORBA_UnionMemberSeq_var (void);
++
++      CORBA_UnionMemberSeq_var &operator= (CORBA_UnionMemberSeq *);
++      CORBA_UnionMemberSeq_var &operator= (const CORBA_UnionMemberSeq_var &);
++      CORBA_UnionMemberSeq *operator-> (void);
++      const CORBA_UnionMemberSeq *operator-> (void) const;
++
++      operator const CORBA_UnionMemberSeq &() const;
++      operator CORBA_UnionMemberSeq &();
++      operator CORBA_UnionMemberSeq &() const;
++      operator CORBA_UnionMemberSeq *&(); // variable-size base types only
+     
+-    UnionMember & operator[] (CORBA::ULong index);
+-    const 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 UnionMemberSeq &in (void) const;
+-    UnionMemberSeq &inout (void);
+-    UnionMemberSeq *&out (void);
+-    UnionMemberSeq *_retn (void);
+-    UnionMemberSeq *ptr (void) const;
++      const CORBA_UnionMemberSeq &in (void) const;
++      CORBA_UnionMemberSeq &inout (void);
++      CORBA_UnionMemberSeq *&out (void);
++      CORBA_UnionMemberSeq *_retn (void);
++      CORBA_UnionMemberSeq *ptr (void) const;
+   
+   private:
+-    UnionMemberSeq *ptr_;
++      CORBA_UnionMemberSeq *ptr_;
+   };
+   
+   
+@@ -3885,42 +3699,40 @@
+ #if !defined (_CORBA_UNIONMEMBERSEQ___OUT_CH_)
+ #define _CORBA_UNIONMEMBERSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export UnionMemberSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq *&);
++      CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq_var &);
++      CORBA_UnionMemberSeq_out (const CORBA_UnionMemberSeq_out &);
++      CORBA_UnionMemberSeq_out &operator= (const CORBA_UnionMemberSeq_out &);
++      CORBA_UnionMemberSeq_out &operator= (CORBA_UnionMemberSeq *);
++      operator CORBA_UnionMemberSeq *&();
++      CORBA_UnionMemberSeq *&ptr (void);
++      CORBA_UnionMemberSeq *operator-> (void);
++      CORBA_UnionMember & operator[] (CORBA::ULong index);
+   
+   private:
+-    UnionMemberSeq *&ptr_;
++      CORBA_UnionMemberSeq *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const UnionMemberSeq_var &);
++      void operator= (const CORBA_UnionMemberSeq_var &);
+   };
+   
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq;
+-  
+   
  #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
  #define _CORBA_ENUMMEMBERSEQ_CH_
-@@ -3745,8 +3672,6 @@
- 
- #endif /* end #if !defined */
+   
+-  class EnumMemberSeq;
+-  class EnumMemberSeq_var;
++    class CORBA_EnumMemberSeq;
++    class CORBA_EnumMemberSeq_var;
+   
+   // *************************************************************
+-  // EnumMemberSeq
++    // CORBA_EnumMemberSeq
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export EnumMemberSeq : public 
++    class TAO_IFR_Client_Export CORBA_EnumMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   TAO_Unbounded_String_Sequence
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+@@ -3928,20 +3740,20 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    EnumMemberSeq (void); // default ctor
+-    EnumMemberSeq (CORBA::ULong max); // uses max size
+-    EnumMemberSeq (
++      CORBA_EnumMemberSeq (void); // default ctor
++      CORBA_EnumMemberSeq (CORBA::ULong max); // uses max size
++      CORBA_EnumMemberSeq (
+         CORBA::ULong max, 
+         CORBA::ULong length, 
+         char * *buffer, 
+         CORBA::Boolean release = 0
+       );
+-    EnumMemberSeq (const EnumMemberSeq &); // copy ctor
+-    ~EnumMemberSeq (void);
++      CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &); // copy ctor
++      ~CORBA_EnumMemberSeq (void);
+     static void _tao_any_destructor (void*);
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef EnumMemberSeq_var _var_type;
++      typedef CORBA_EnumMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+     
+     
+@@ -3954,38 +3766,38 @@
+ #define _CORBA_ENUMMEMBERSEQ___VAR_CH_
+   
+   // *************************************************************
+-  // class CORBA::EnumMemberSeq_var
++    // class CORBA_EnumMemberSeq_var
+   // *************************************************************
+   
+-  class TAO_IFR_Client_Export EnumMemberSeq_var
++    class TAO_IFR_Client_Export CORBA_EnumMemberSeq_var
+   {
+   public:
+-    EnumMemberSeq_var (void);
+-    EnumMemberSeq_var (EnumMemberSeq *);
+-    EnumMemberSeq_var (const EnumMemberSeq_var &);
+-    ~EnumMemberSeq_var (void);
+-    
+-    EnumMemberSeq_var &operator= (EnumMemberSeq *);
+-    EnumMemberSeq_var &operator= (const EnumMemberSeq_var &);
+-    EnumMemberSeq *operator-> (void);
+-    const EnumMemberSeq *operator-> (void) const;
+-    
+-    operator const EnumMemberSeq &() const;
+-    operator EnumMemberSeq &();
+-    operator EnumMemberSeq &() const;
+-    operator EnumMemberSeq *&(); // variable-size base types only
++      CORBA_EnumMemberSeq_var (void);
++      CORBA_EnumMemberSeq_var (CORBA_EnumMemberSeq *);
++      CORBA_EnumMemberSeq_var (const CORBA_EnumMemberSeq_var &);
++      ~CORBA_EnumMemberSeq_var (void);
++
++      CORBA_EnumMemberSeq_var &operator= (CORBA_EnumMemberSeq *);
++      CORBA_EnumMemberSeq_var &operator= (const CORBA_EnumMemberSeq_var &);
++      CORBA_EnumMemberSeq *operator-> (void);
++      const CORBA_EnumMemberSeq *operator-> (void) const;
++
++      operator const CORBA_EnumMemberSeq &() const;
++      operator CORBA_EnumMemberSeq &();
++      operator CORBA_EnumMemberSeq &() const;
++      operator CORBA_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 CORBA_EnumMemberSeq &in (void) const;
++      CORBA_EnumMemberSeq &inout (void);
++      CORBA_EnumMemberSeq *&out (void);
++      CORBA_EnumMemberSeq *_retn (void);
++      CORBA_EnumMemberSeq *ptr (void) const;
+   
+   private:
+-    EnumMemberSeq *ptr_;
++      CORBA_EnumMemberSeq *ptr_;
+   };
+   
+   
+@@ -3995,180 +3807,93 @@
+ #if !defined (_CORBA_ENUMMEMBERSEQ___OUT_CH_)
+ #define _CORBA_ENUMMEMBERSEQ___OUT_CH_
+   
+-  class TAO_IFR_Client_Export EnumMemberSeq_out
++    class TAO_IFR_Client_Export CORBA_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);
++      CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq *&);
++      CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq_var &);
++      CORBA_EnumMemberSeq_out (const CORBA_EnumMemberSeq_out &);
++      CORBA_EnumMemberSeq_out &operator= (const CORBA_EnumMemberSeq_out &);
++      CORBA_EnumMemberSeq_out &operator= (CORBA_EnumMemberSeq *);
++      operator CORBA_EnumMemberSeq *&();
++      CORBA_EnumMemberSeq *&ptr (void);
++      CORBA_EnumMemberSeq *operator-> (void);
+     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+   
+   private:
+-    EnumMemberSeq *&ptr_;
++      CORBA_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 (_CORBA_CONTAINER___PTR_CH_)
+-#define _CORBA_CONTAINER___PTR_CH_
+-  
+-  class Container;
+-  typedef Container *Container_ptr;
+-  
+-#endif /* end #if !defined */
+-  
+-  
+-#if !defined (_CORBA_CONTAINER___VAR_CH_)
+-#define _CORBA_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;
+-    
+-    // Hooks used by template sequence and object manager classes
+-    // for non-defined forward declared interfaces.
+-    static Container_ptr tao_duplicate (Container_ptr);
+-    static void tao_release (Container_ptr);
+-    static Container_ptr tao_nil (void);
+-    static Container_ptr tao_narrow (
+-        CORBA::Object *
+-        ACE_ENV_ARG_DECL_NOT_USED
+-      );
+-    static CORBA::Object * tao_upcast (void *);
+-  
+-  private:
+-    Container_ptr ptr_;
+-    // Unimplemented - prevents widening assignment.
+-    Container_var (const TAO_Base_var &rhs);
+-    Container_var &operator= (const TAO_Base_var &rhs);
++      void operator= (const CORBA_EnumMemberSeq_var &);
+   };
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_EnumMemberSeq;
--
  
+ #endif /* end #if !defined */
+   
+   
+-#if !defined (_CORBA_CONTAINER___OUT_CH_)
+-#define _CORBA_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_;
+-  };
+-  
+-  
+-#endif /* end #if !defined */
+-  
+-  // *************************************************************
+-  // CORBA::Container
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_interface/interface_ch.cpp:106
+-  // *************************************************************
+-  
+-  
  #if !defined (_CORBA_CONTAINER_CH_)
  #define _CORBA_CONTAINER_CH_
-@@ -4761,8 +4686,6 @@
+   
+-  // 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;
++    // Forward Classes Declaration
++    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 Container
+-    : public virtual CORBA::IRObject
++    class TAO_IFR_Client_Export CORBA_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 CORBA_Container_ptr _ptr_type;
++      typedef CORBA_Container_var _var_type;
+   #endif /* ! __GNUC__ || g++ >= 2.8 */
  
+     static int _tao_class_id;
+     
+-    // The static operations.
+-    static Container_ptr _duplicate (Container_ptr obj);
++      // the static operations
++      static CORBA_Container_ptr _duplicate (CORBA_Container_ptr obj);
+     
+-    static Container_ptr _narrow (
++      static CORBA_Container_ptr _narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static Container_ptr _unchecked_narrow (
++
++      static CORBA_Container_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static Container_ptr _nil (void)
++
++      static CORBA_Container_ptr _nil (void)
+       {
+-        return (Container_ptr)0;
++          return (CORBA_Container_ptr)0;
+       }
+     
+     static void _tao_any_destructor (void*);
+     
+-    virtual ::CORBA::Contained_ptr lookup (
++      virtual CORBA_Contained_ptr lookup (
+         const char * search_name
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::ContainedSeq * contents (
++      virtual CORBA_ContainedSeq * contents (
+         CORBA::DefinitionKind limit_type,
+         CORBA::Boolean exclude_inherited
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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,
+         CORBA::Boolean exclude_inherited
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+@@ -4185,8 +3910,8 @@
+ 
+       static void _tao_any_destructor (void*);
+       
+-      ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
+-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
++        CORBA_Contained_var contained_object;
++        CORBA::DefinitionKind kind;
+       CORBA::Any value;
+       
+     };
+@@ -4239,7 +3964,7 @@
+       void operator= (const Description_var &);
+     };
+     
+-    static ::CORBA::TypeCode_ptr _tc_Description;
++      static CORBA::TypeCode_ptr _tc_Description;
+     
+     
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+@@ -4247,7 +3972,7 @@
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
+ #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
+     
+-    class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
++      class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+       : public TAO_Unbounded_Base_Sequence
+     {
+     public:
+@@ -4338,7 +4063,7 @@
+ #define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
+     
+     // *************************************************************
+-    // class CORBA::Container::DescriptionSeq_var
++      // class CORBA_Container::DescriptionSeq_var
+     // *************************************************************
+     
+     class TAO_IFR_Client_Export DescriptionSeq_var
+@@ -4402,201 +4127,201 @@
+     
  #endif /* end #if !defined */
+     
+-    static ::CORBA::TypeCode_ptr _tc_DescriptionSeq;
++      static CORBA::TypeCode_ptr _tc_DescriptionSeq;
+     
+-    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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::ModuleDef_ptr create_module (
++      virtual CORBA_ModuleDef_ptr create_module (
+         const char * id,
+         const char * name,
+         const char * version
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_StructMemberSeq & members
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          CORBA_IDLType_ptr discriminator_type,
++          const CORBA_UnionMemberSeq & members
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_EnumMemberSeq & members
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          CORBA_IDLType_ptr original_type
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_InterfaceDefSeq & base_interfaces
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_ValueDefSeq & abstract_base_values,
++          const CORBA_InterfaceDefSeq & supported_interfaces,
++          const CORBA_InitializerSeq & initializers
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          CORBA_IDLType_ptr original_type_def
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_StructMemberSeq & members
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::NativeDef_ptr create_native (
++      virtual CORBA_NativeDef_ptr create_native (
+         const char * id,
+         const char * name,
+         const char * version
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_AbstractInterfaceDefSeq & base_interfaces
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         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
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      )
++          const CORBA_InterfaceDefSeq & base_interfaces
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
++
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual CORBA::Boolean _is_a (
+         const CORBA::Char *type_id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+     virtual void *_tao_QueryInterface (ptr_arith_t type);
+     
+     virtual const char* _interface_repository_id (void) const;
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Container;
+   private:
+-    _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
++      _TAO_CORBA_Container_Proxy_Broker *the_TAO_CORBA_Container_Proxy_Broker_;
+     
+   protected:
+-    Container (int collocated = 0);
++      CORBA_Container (int collocated = 0);
+     
+-    // These methods travese the inheritance tree and set the
++      // This methods travese the inheritance tree and set the
+     // parents piece of the given class in the right mode
+     virtual void CORBA_Container_setup_collocation (int collocated);
+     
+-    Container (
++      CORBA_Container (
+         TAO_Stub *objref, 
+         CORBA::Boolean _tao_collocated = 0,
+         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 ~Container (void);
++      virtual ~CORBA_Container (void);
+   
+   private:
+-    Container (const Container &);
+-    void operator= (const Container &);
++      CORBA_Container (const CORBA_Container &);
++      void operator= (const CORBA_Container &);
+   };
+   
+   // The Proxy Implementations are used by each interface to
+@@ -4608,12 +4333,12 @@
+   //                    Base Proxy Impl. Declaration
+   //
+   
+-  class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl
+-    : public virtual CORBA::_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 ::CORBA::Contained_ptr lookup (
++      virtual ~_TAO_CORBA_Container_Proxy_Impl (void) { }
++      virtual CORBA_Contained_ptr lookup (
+         CORBA_Object *_collocated_tao_target_,
+         const char * search_name
+         ACE_ENV_ARG_DECL
+@@ -4622,7 +4347,7 @@
+         CORBA::SystemException
+       )) = 0;
+     
+-    virtual ::CORBA::ContainedSeq * contents (
++      virtual CORBA_ContainedSeq * contents (
+         CORBA_Object *_collocated_tao_target_,
+         CORBA::DefinitionKind limit_type,
+         CORBA::Boolean exclude_inherited
+@@ -4632,7 +4357,7 @@
+         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,
+@@ -4644,7 +4369,7 @@
+         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,
+@@ -4655,7 +4380,7 @@
+         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,
+@@ -4666,12 +4391,12 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+@@ -4679,110 +4404,110 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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,
+@@ -4793,24 +4518,24 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       ACE_THROW_SPEC ((
+@@ -4819,7 +4544,7 @@
+     
+     
+   protected:
+-    _TAO_Container_Proxy_Impl (void);
++      _TAO_CORBA_Container_Proxy_Impl (void);
+   };
+   
+   //
+@@ -4831,16 +4556,16 @@
+   //                Remote Proxy 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 CORBA::_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 ::CORBA::Contained_ptr lookup (
++      virtual ~_TAO_CORBA_Container_Remote_Proxy_Impl (void) { }
++      virtual CORBA_Contained_ptr lookup (
+         CORBA_Object *_collocated_tao_target_,
+         const char * search_name
+         ACE_ENV_ARG_DECL
+@@ -4849,7 +4574,7 @@
+         CORBA::SystemException
+       ));
+     
+-    virtual ::CORBA::ContainedSeq * contents (
++      virtual CORBA_ContainedSeq * contents (
+         CORBA_Object *_collocated_tao_target_,
+         CORBA::DefinitionKind limit_type,
+         CORBA::Boolean exclude_inherited
+@@ -4859,7 +4584,7 @@
+         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,
+@@ -4871,7 +4596,7 @@
+         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,
+@@ -4882,7 +4607,7 @@
+         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,
+@@ -4893,12 +4618,12 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+@@ -4906,110 +4631,110 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       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,
+@@ -5020,24 +4745,24 @@
+         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
+         ACE_ENV_ARG_DECL
+       )
+       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
+         ACE_ENV_ARG_DECL
+       )
+       ACE_THROW_SPEC ((
+@@ -5061,17 +4786,17 @@
+   //                 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 (
+-        Container *object
++      virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
++      virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
++          CORBA_Container *object
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+       ) = 0;
+     
+   protected:
+-    _TAO_Container_Proxy_Broker (void);
++      _TAO_CORBA_Container_Proxy_Broker (void);
+     
+   };
+   
+@@ -5084,27 +4809,27 @@
+   //                 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 (
+-        Container *object
++      virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
++          CORBA_Container *object
+         ACE_ENV_ARG_DECL
+       );
+     
+   private:
+-    _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
++        _TAO_CORBA_Container_Remote_Proxy_Impl remote_proxy_impl_;
+   
+   public:
+     // 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.
+-    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);
+   };
+   
+   //
+@@ -5114,176 +4839,87 @@
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
+-  
+-  
+-#if !defined (_CORBA_IDLTYPE___PTR_CH_)
+-#define _CORBA_IDLTYPE___PTR_CH_
+-  
+-  class IDLType;
+-  typedef IDLType *IDLType_ptr;
+-  
+-#endif /* end #if !defined */
+-  
+-  
+-#if !defined (_CORBA_IDLTYPE___VAR_CH_)
+-#define _CORBA_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;
+-    
+-    // Hooks used by template sequence and object manager classes
+-    // for non-defined forward declared interfaces.
+-    static IDLType_ptr tao_duplicate (IDLType_ptr);
+-    static void tao_release (IDLType_ptr);
+-    static IDLType_ptr tao_nil (void);
+-    static IDLType_ptr tao_narrow (
+-        CORBA::Object *
+-        ACE_ENV_ARG_DECL_NOT_USED
+-      );
+-    static CORBA::Object * tao_upcast (void *);
+-  
+-  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 (_CORBA_IDLTYPE___OUT_CH_)
+-#define _CORBA_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 */
+-  
+-  // *************************************************************
+-  // CORBA::IDLType
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_interface/interface_ch.cpp:106
+-  // *************************************************************
+-  
+-  
  #if !defined (_CORBA_IDLTYPE_CH_)
  #define _CORBA_IDLTYPE_CH_
-@@ -4971,8 +4894,6 @@
- 
- #endif /* end #if !defined */
+   
+-  // 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;
++      // Forward Classes Declaration
++      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 IDLType
+-    : public virtual CORBA::IRObject
++      class TAO_IFR_Client_Export CORBA_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 CORBA_IDLType_ptr _ptr_type;
++        typedef CORBA_IDLType_var _var_type;
+   #endif /* ! __GNUC__ || g++ >= 2.8 */
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_IDLType;
--
+     static int _tao_class_id;
+     
+-    // The static operations.
+-    static IDLType_ptr _duplicate (IDLType_ptr obj);
++        // the static operations
++        static CORBA_IDLType_ptr _duplicate (CORBA_IDLType_ptr obj);
+     
+-    static IDLType_ptr _narrow (
++        static CORBA_IDLType_ptr _narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+-    static IDLType_ptr _unchecked_narrow (
++        static CORBA_IDLType_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+-    static IDLType_ptr _nil (void)
++        static CORBA_IDLType_ptr _nil (void)
+       {
+-        return (IDLType_ptr)0;
++            return (CORBA_IDLType_ptr)0;
+       }
+     
+     static void _tao_any_destructor (void*);
+     
+     virtual CORBA::TypeCode_ptr type (
++            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+         
+-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+-      )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       ));
+     
+     virtual CORBA::Boolean _is_a (
+         const CORBA::Char *type_id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+     virtual void *_tao_QueryInterface (ptr_arith_t type);
+     
+     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:
+-    IDLType (int collocated = 0);
++        CORBA_IDLType (int collocated = 0);
+     
+-    // These methods travese the inheritance tree and set the
++        // This methods travese the inheritance tree and set the
+     // parents piece of the given class in the right mode
+     virtual void CORBA_IDLType_setup_collocation (int collocated);
+     
+-    IDLType (
++        CORBA_IDLType (
+         TAO_Stub *objref, 
+         CORBA::Boolean _tao_collocated = 0,
+         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 ~IDLType (void);
++        virtual ~CORBA_IDLType (void);
+   
+   private:
+-    IDLType (const IDLType &);
+-    void operator= (const IDLType &);
++        CORBA_IDLType (const CORBA_IDLType &);
++        void operator= (const CORBA_IDLType &);
+   };
+   
+   // The Proxy Implementations are used by each interface to
+@@ -5295,11 +4931,11 @@
+   //                    Base Proxy Impl. Declaration
+   //
+   
+-  class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl
+-    : public virtual CORBA::_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_
+         ACE_ENV_ARG_DECL
+@@ -5310,7 +4946,7 @@
+     
+     
+   protected:
+-    _TAO_IDLType_Proxy_Impl (void);
++        _TAO_CORBA_IDLType_Proxy_Impl (void);
+   };
+   
+   //
+@@ -5322,15 +4958,15 @@
+   //                Remote Proxy 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 CORBA::_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_
+         ACE_ENV_ARG_DECL
+@@ -5356,17 +4992,17 @@
+   //                 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 (
+-        IDLType *object
++        virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
++        virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
++            CORBA_IDLType *object
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+       ) = 0;
+     
+   protected:
+-    _TAO_IDLType_Proxy_Broker (void);
++        _TAO_CORBA_IDLType_Proxy_Broker (void);
+     
+   };
+   
+@@ -5379,27 +5015,27 @@
+   //                 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 (
+-        IDLType *object
++        virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
++            CORBA_IDLType *object
+         ACE_ENV_ARG_DECL
+       );
+     
+   private:
+-    _TAO_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
++          _TAO_CORBA_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
+   
+   public:
+     // 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.
+-    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);
+   };
+   
+   //
+@@ -5409,14 +5045,12 @@
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType;
+-  
+   
  #if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
  #define _CORBA_TYPEDEFDEF___PTR_CH_
-@@ -5235,8 +5156,6 @@
+   
+-  class TypedefDef;
+-  typedef TypedefDef *TypedefDef_ptr;
++        class CORBA_TypedefDef;
++        typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
+   
+ #endif /* end #if !defined */
+   
+@@ -5424,43 +5058,43 @@
+ #if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
+ #define _CORBA_TYPEDEFDEF___VAR_CH_
+   
+-  class TAO_IFR_Client_Export TypedefDef_var : public TAO_Base_var
++        class TAO_IFR_Client_Export CORBA_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
++          CORBA_TypedefDef_var (void); // default constructor
++          CORBA_TypedefDef_var (CORBA_TypedefDef_ptr p) : ptr_ (p) {}
++          CORBA_TypedefDef_var (const CORBA_TypedefDef_var &); // copy constructor
++          ~CORBA_TypedefDef_var (void); // destructor
+     
+-    TypedefDef_var &operator= (TypedefDef_ptr);
+-    TypedefDef_var &operator= (const TypedefDef_var &);
+-    TypedefDef_ptr operator-> (void) const;
++          CORBA_TypedefDef_var &operator= (CORBA_TypedefDef_ptr);
++          CORBA_TypedefDef_var &operator= (const CORBA_TypedefDef_var &);
++          CORBA_TypedefDef_ptr operator-> (void) const;
+     
+-    operator const TypedefDef_ptr &() const;
+-    operator TypedefDef_ptr &();
++          operator const CORBA_TypedefDef_ptr &() const;
++          operator CORBA_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;
++          CORBA_TypedefDef_ptr in (void) const;
++          CORBA_TypedefDef_ptr &inout (void);
++          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 TypedefDef_ptr tao_duplicate (TypedefDef_ptr);
+-    static void tao_release (TypedefDef_ptr);
+-    static TypedefDef_ptr tao_nil (void);
+-    static TypedefDef_ptr tao_narrow (
++          static CORBA_TypedefDef_ptr tao_duplicate (CORBA_TypedefDef_ptr);
++          static void tao_release (CORBA_TypedefDef_ptr);
++          static CORBA_TypedefDef_ptr tao_nil (void);
++          static CORBA_TypedefDef_ptr tao_narrow (
+         CORBA::Object *
+         ACE_ENV_ARG_DECL_NOT_USED
+       );
+     static CORBA::Object * tao_upcast (void *);
+   
+   private:
+-    TypedefDef_ptr ptr_;
++          CORBA_TypedefDef_ptr ptr_;
+     // Unimplemented - prevents widening assignment.
+-    TypedefDef_var (const TAO_Base_var &rhs);
+-    TypedefDef_var &operator= (const TAO_Base_var &rhs);
++          CORBA_TypedefDef_var (const TAO_Base_var &rhs);
++          CORBA_TypedefDef_var &operator= (const TAO_Base_var &rhs);
+   };
+ 
  
+@@ -5470,108 +5104,102 @@
+ #if !defined (_CORBA_TYPEDEFDEF___OUT_CH_)
+ #define _CORBA_TYPEDEFDEF___OUT_CH_
+   
+-  class TAO_IFR_Client_Export TypedefDef_out
++        class TAO_IFR_Client_Export CORBA_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);
++          CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &);
++          CORBA_TypedefDef_out (CORBA_TypedefDef_var &);
++          CORBA_TypedefDef_out (const CORBA_TypedefDef_out &);
++          CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_out &);
++          CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_var &);
++          CORBA_TypedefDef_out &operator= (CORBA_TypedefDef_ptr);
++          operator CORBA_TypedefDef_ptr &();
++          CORBA_TypedefDef_ptr &ptr (void);
++          CORBA_TypedefDef_ptr operator-> (void);
+   
+   private:
+-    TypedefDef_ptr &ptr_;
++          CORBA_TypedefDef_ptr &ptr_;
+   };
+   
+   
  #endif /* end #if !defined */
+   
+-  // *************************************************************
+-  // CORBA::TypedefDef
+-  // TAO_IDL - Generated from
+-  // be/be_visitor_interface/interface_ch.cpp:106
+-  // *************************************************************
+-  
+   
+ #if !defined (_CORBA_TYPEDEFDEF_CH_)
+ #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_IFR_Client_Export TypedefDef
+-    : public virtual CORBA::Contained,
+-      public virtual CORBA::IDLType
++        // Forward Classes Declaration
++        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
+   {
+   public:
+   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef TypedefDef_ptr _ptr_type;
+-    typedef TypedefDef_var _var_type;
++          typedef CORBA_TypedefDef_ptr _ptr_type;
++          typedef CORBA_TypedefDef_var _var_type;
+   #endif /* ! __GNUC__ || g++ >= 2.8 */
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypedefDef;
--
- struct CORBA_TypeDescription;
- class CORBA_TypeDescription_var;
+     static int _tao_class_id;
+     
+-    // The static operations.
+-    static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
++          // the static operations
++          static CORBA_TypedefDef_ptr _duplicate (CORBA_TypedefDef_ptr obj);
+     
+-    static TypedefDef_ptr _narrow (
++          static CORBA_TypedefDef_ptr _narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+     
+-    static TypedefDef_ptr _unchecked_narrow (
++
++          static CORBA_TypedefDef_ptr _unchecked_narrow (
+         CORBA::Object_ptr obj
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+-    static TypedefDef_ptr _nil (void)
++          static CORBA_TypedefDef_ptr _nil (void)
+       {
+-        return (TypedefDef_ptr)0;
++              return (CORBA_TypedefDef_ptr)0;
+       }
+     
+     static void _tao_any_destructor (void*);
+     
+     virtual CORBA::Boolean _is_a (
+         const CORBA::Char *type_id
+-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-      );
++              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
+     
+     virtual void *_tao_QueryInterface (ptr_arith_t type);
+     
+     virtual const char* _interface_repository_id (void) const;
  
-@@ -5303,8 +5222,6 @@
-   void operator= (const CORBA_TypeDescription_var &);
- };
+   private:
+-    _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
++          _TAO_CORBA_TypedefDef_Proxy_Broker *the_TAO_CORBA_TypedefDef_Proxy_Broker_;
+     
+   protected:
+-    TypedefDef (int collocated = 0);
++          CORBA_TypedefDef (int collocated = 0);
+     
+-    // These methods travese the inheritance tree and set the
++          // 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);
+     
+-    TypedefDef (
++          CORBA_TypedefDef (
+         TAO_Stub *objref, 
+         CORBA::Boolean _tao_collocated = 0,
+         TAO_Abstract_ServantBase *servant = 0
+       );
+     
+-    friend class _TAO_TypedefDef_Remote_Proxy_Impl;
+-    friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+-    friend class _TAO_TypedefDef_Direct_Proxy_Impl;
++          friend class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
++          friend class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
++          friend class _TAO_CORBA_TypedefDef_Direct_Proxy_Impl;
+     
+-    virtual ~TypedefDef (void);
++          virtual ~CORBA_TypedefDef (void);
+   
+   private:
+-    TypedefDef (const TypedefDef &);
+-    void operator= (const TypedefDef &);
++          CORBA_TypedefDef (const CORBA_TypedefDef &);
++          void operator= (const CORBA_TypedefDef &);
+   };
+   
+   // The Proxy Implementations are used by each interface to
+@@ -5583,15 +5211,15 @@
+   //                    Base Proxy Impl. Declaration
+   //
+   
+-  class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl
+-    : public virtual CORBA::_TAO_Contained_Proxy_Impl, 
+-      public virtual CORBA::_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);
+   };
+   
+   //
+@@ -5603,16 +5231,16 @@
+   //                Remote Proxy 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 CORBA::_TAO_Contained_Remote_Proxy_Impl, 
+-      public virtual CORBA::_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) { }
+     
+   };
+   
+@@ -5630,17 +5258,17 @@
+   //                 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 (
+-        TypedefDef *object
++          virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
++          virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
++              CORBA_TypedefDef *object
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+       ) = 0;
+     
+   protected:
+-    _TAO_TypedefDef_Proxy_Broker (void);
++          _TAO_CORBA_TypedefDef_Proxy_Broker (void);
+     
+   };
+   
+@@ -5653,27 +5281,27 @@
+   //                 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 (
+-        TypedefDef *object
++          virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
++              CORBA_TypedefDef *object
+         ACE_ENV_ARG_DECL
+       );
+     
+   private:
+-    _TAO_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
++            _TAO_CORBA_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
+   
+   public:
+     // 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.
+-    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);
+   };
+   
+   //
+@@ -5683,16 +5311,14 @@
+   
+ #endif /* end #if !defined */
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef;
++          struct CORBA_TypeDescription;
++          class CORBA_TypeDescription_var;
+   
+-  struct TypeDescription;
+-  class TypeDescription_var;
+-  
+-  struct TAO_IFR_Client_Export TypeDescription
++          struct TAO_IFR_Client_Export CORBA_TypeDescription
+   {
+     
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-    typedef TypeDescription_var _var_type;
++            typedef CORBA_TypeDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
  
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypeDescription;
+     static void _tao_any_destructor (void*);
+@@ -5705,111 +5331,105 @@
+     
+   };
+   
+-  class TAO_IFR_Client_Export TypeDescription_var
++          class TAO_IFR_Client_Export CORBA_TypeDescription_var
+   {
+   public:
+-    TypeDescription_var (void);
+-    TypeDescription_var (TypeDescription *);
+-    TypeDescription_var (const TypeDescription_var &);
+-    ~TypeDescription_var (void);
+-    
+-    TypeDescription_var &operator= (TypeDescription *);
+-    TypeDescription_var &operator= (const TypeDescription_var &);
+-    TypeDescription *operator-> (void);
+-    const TypeDescription *operator-> (void) const;
+-    
+-    operator const TypeDescription &() const;
+-    operator TypeDescription &();
+-    operator TypeDescription &() const;
++            CORBA_TypeDescription_var (void);
++            CORBA_TypeDescription_var (CORBA_TypeDescription *);
++            CORBA_TypeDescription_var (const CORBA_TypeDescription_var &);
++            ~CORBA_TypeDescription_var (void);
++
++            CORBA_TypeDescription_var &operator= (CORBA_TypeDescription *);
++            CORBA_TypeDescription_var &operator= (const CORBA_TypeDescription_var &);
++            CORBA_TypeDescription *operator-> (void);
++            const CORBA_TypeDescription *operator-> (void) const;
++
++            operator const CORBA_TypeDescription &() const;
++            operator CORBA_TypeDescription &();
++            operator CORBA_TypeDescription &() const;
+     // Variable-size types only.
+-    operator TypeDescription *&();
++            operator CORBA_TypeDescription *&();
+     
+     // in, inout, out, _retn 
+-    const TypeDescription &in (void) const;
+-    TypeDescription &inout (void);
+-    TypeDescription *&out (void);
+-    TypeDescription *_retn (void);
+-    TypeDescription *ptr (void) const;
++            const CORBA_TypeDescription &in (void) const;
++            CORBA_TypeDescription &inout (void);
++            CORBA_TypeDescription *&out (void);
++            CORBA_TypeDescription *_retn (void);
++            CORBA_TypeDescription *ptr (void) const;
+   
+   private:
+-    TypeDescription *ptr_;
++            CORBA_TypeDescription *ptr_;
+   };
+   
+-  class TAO_IFR_Client_Export TypeDescription_out
++          class TAO_IFR_Client_Export CORBA_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);
++            CORBA_TypeDescription_out (CORBA_TypeDescription *&);
++            CORBA_TypeDescription_out (CORBA_TypeDescription_var &);
++            CORBA_TypeDescription_out (const CORBA_TypeDescription_out &);
++            CORBA_TypeDescription_out &operator= (const CORBA_TypeDescription_out &);
++            CORBA_TypeDescription_out &operator= (CORBA_TypeDescription *);
++            operator CORBA_TypeDescription *&();
++            CORBA_TypeDescription *&ptr (void);
++            CORBA_TypeDescription *operator-> (void);
+     
+   private:
+-    TypeDescription *&ptr_;
++            CORBA_TypeDescription *&ptr_;
+     // Assignment from T_var not allowed.
+-    void operator= (const TypeDescription_var &);
++            void operator= (const CORBA_TypeDescription_var &);
+   };
+   
+-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription;
+-  
+-  
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
 -
  // Proxy Broker Factory function pointer declarations.
  
  extern TAO_IFR_Client_Export
-@@ -5337,407 +5254,407 @@
+-CORBA::_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
+   );
+ 
+ extern TAO_IFR_Client_Export
+-CORBA::_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
+   );
+ 
+ extern TAO_IFR_Client_Export
+-CORBA::_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
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_Repository
+ extern TAO_IFR_Client_Export
+-CORBA::_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
+   );
+ 
+ extern TAO_IFR_Client_Export
+-CORBA::_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
+   );
+ 
+ // External declarations for undefined interface
+-// CORBA::Repository
++          // CORBA_Repository
  TAO_IFR_Client_Export
- CORBA_Repository_ptr
+-CORBA::Repository_ptr
++          CORBA_Repository_ptr
  tao_CORBA_Repository_duplicate (
-     CORBA_Repository_ptr
+-    CORBA::Repository_ptr
++              CORBA_Repository_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_Repository_release (
-     CORBA_Repository_ptr
+-    CORBA::Repository_ptr
++              CORBA_Repository_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_Repository_ptr
+ TAO_IFR_Client_Export
+-CORBA::Repository_ptr
++          CORBA_Repository_ptr
  tao_CORBA_Repository_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_Repository_ptr
+ TAO_IFR_Client_Export
+-CORBA::Repository_ptr
++          CORBA_Repository_ptr
  tao_CORBA_Repository_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_Repository_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5821,24 +5441,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_ModuleDef
+ // External declarations for undefined interface
+-// CORBA::ModuleDef
++          // CORBA_ModuleDef
  TAO_IFR_Client_Export
- CORBA_ModuleDef_ptr
+-CORBA::ModuleDef_ptr
++          CORBA_ModuleDef_ptr
  tao_CORBA_ModuleDef_duplicate (
-     CORBA_ModuleDef_ptr
+-    CORBA::ModuleDef_ptr
++              CORBA_ModuleDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_ModuleDef_release (
-     CORBA_ModuleDef_ptr
+-    CORBA::ModuleDef_ptr
++              CORBA_ModuleDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ModuleDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ModuleDef_ptr
++          CORBA_ModuleDef_ptr
  tao_CORBA_ModuleDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ModuleDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ModuleDef_ptr
++          CORBA_ModuleDef_ptr
  tao_CORBA_ModuleDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_ModuleDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5850,24 +5470,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_ConstantDef
+ // External declarations for undefined interface
+-// CORBA::ConstantDef
++          // CORBA_ConstantDef
  TAO_IFR_Client_Export
- CORBA_ConstantDef_ptr
+-CORBA::ConstantDef_ptr
++          CORBA_ConstantDef_ptr
  tao_CORBA_ConstantDef_duplicate (
-     CORBA_ConstantDef_ptr
+-    CORBA::ConstantDef_ptr
++              CORBA_ConstantDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_ConstantDef_release (
-     CORBA_ConstantDef_ptr
+-    CORBA::ConstantDef_ptr
++              CORBA_ConstantDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ConstantDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ConstantDef_ptr
++          CORBA_ConstantDef_ptr
  tao_CORBA_ConstantDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ConstantDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ConstantDef_ptr
++          CORBA_ConstantDef_ptr
  tao_CORBA_ConstantDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_ConstantDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5879,24 +5499,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_StructDef
+ // External declarations for undefined interface
+-// CORBA::StructDef
++          // CORBA_StructDef
  TAO_IFR_Client_Export
- CORBA_StructDef_ptr
+-CORBA::StructDef_ptr
++          CORBA_StructDef_ptr
  tao_CORBA_StructDef_duplicate (
-     CORBA_StructDef_ptr
+-    CORBA::StructDef_ptr
++              CORBA_StructDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_StructDef_release (
-     CORBA_StructDef_ptr
+-    CORBA::StructDef_ptr
++              CORBA_StructDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_StructDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::StructDef_ptr
++          CORBA_StructDef_ptr
  tao_CORBA_StructDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_StructDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::StructDef_ptr
++          CORBA_StructDef_ptr
  tao_CORBA_StructDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_StructDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5908,24 +5528,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_UnionDef
+ // External declarations for undefined interface
+-// CORBA::UnionDef
++          // CORBA_UnionDef
  TAO_IFR_Client_Export
- CORBA_UnionDef_ptr
+-CORBA::UnionDef_ptr
++          CORBA_UnionDef_ptr
  tao_CORBA_UnionDef_duplicate (
-     CORBA_UnionDef_ptr
+-    CORBA::UnionDef_ptr
++              CORBA_UnionDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_UnionDef_release (
-     CORBA_UnionDef_ptr
+-    CORBA::UnionDef_ptr
++              CORBA_UnionDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_UnionDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::UnionDef_ptr
++          CORBA_UnionDef_ptr
  tao_CORBA_UnionDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_UnionDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::UnionDef_ptr
++          CORBA_UnionDef_ptr
  tao_CORBA_UnionDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_UnionDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5937,24 +5557,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_EnumDef
+ // External declarations for undefined interface
+-// CORBA::EnumDef
++          // CORBA_EnumDef
  TAO_IFR_Client_Export
- CORBA_EnumDef_ptr
+-CORBA::EnumDef_ptr
++          CORBA_EnumDef_ptr
  tao_CORBA_EnumDef_duplicate (
-     CORBA_EnumDef_ptr
+-    CORBA::EnumDef_ptr
++              CORBA_EnumDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_EnumDef_release (
-     CORBA_EnumDef_ptr
+-    CORBA::EnumDef_ptr
++              CORBA_EnumDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_EnumDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::EnumDef_ptr
++          CORBA_EnumDef_ptr
  tao_CORBA_EnumDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_EnumDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::EnumDef_ptr
++          CORBA_EnumDef_ptr
  tao_CORBA_EnumDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_EnumDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5966,24 +5586,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_AliasDef
+ // External declarations for undefined interface
+-// CORBA::AliasDef
++          // CORBA_AliasDef
  TAO_IFR_Client_Export
- CORBA_AliasDef_ptr
+-CORBA::AliasDef_ptr
++          CORBA_AliasDef_ptr
  tao_CORBA_AliasDef_duplicate (
-     CORBA_AliasDef_ptr
+-    CORBA::AliasDef_ptr
++              CORBA_AliasDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_AliasDef_release (
-     CORBA_AliasDef_ptr
+-    CORBA::AliasDef_ptr
++              CORBA_AliasDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_AliasDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::AliasDef_ptr
++          CORBA_AliasDef_ptr
  tao_CORBA_AliasDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_AliasDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::AliasDef_ptr
++          CORBA_AliasDef_ptr
  tao_CORBA_AliasDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_AliasDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -5995,24 +5615,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_InterfaceDef
+ // External declarations for undefined interface
+-// CORBA::InterfaceDef
++          // CORBA_InterfaceDef
  TAO_IFR_Client_Export
- CORBA_InterfaceDef_ptr
+-CORBA::InterfaceDef_ptr
++          CORBA_InterfaceDef_ptr
  tao_CORBA_InterfaceDef_duplicate (
-     CORBA_InterfaceDef_ptr
+-    CORBA::InterfaceDef_ptr
++              CORBA_InterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_InterfaceDef_release (
-     CORBA_InterfaceDef_ptr
+-    CORBA::InterfaceDef_ptr
++              CORBA_InterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_InterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::InterfaceDef_ptr
++          CORBA_InterfaceDef_ptr
  tao_CORBA_InterfaceDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_InterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::InterfaceDef_ptr
++          CORBA_InterfaceDef_ptr
  tao_CORBA_InterfaceDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_InterfaceDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6024,24 +5644,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_ExceptionDef
+ // External declarations for undefined interface
+-// CORBA::ExceptionDef
++          // CORBA_ExceptionDef
  TAO_IFR_Client_Export
- CORBA_ExceptionDef_ptr
+-CORBA::ExceptionDef_ptr
++          CORBA_ExceptionDef_ptr
  tao_CORBA_ExceptionDef_duplicate (
-     CORBA_ExceptionDef_ptr
+-    CORBA::ExceptionDef_ptr
++              CORBA_ExceptionDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_ExceptionDef_release (
-     CORBA_ExceptionDef_ptr
+-    CORBA::ExceptionDef_ptr
++              CORBA_ExceptionDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ExceptionDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ExceptionDef_ptr
++          CORBA_ExceptionDef_ptr
  tao_CORBA_ExceptionDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ExceptionDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ExceptionDef_ptr
++          CORBA_ExceptionDef_ptr
  tao_CORBA_ExceptionDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_ExceptionDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6053,24 +5673,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_NativeDef
+ // External declarations for undefined interface
+-// CORBA::NativeDef
++          // CORBA_NativeDef
  TAO_IFR_Client_Export
- CORBA_NativeDef_ptr
+-CORBA::NativeDef_ptr
++          CORBA_NativeDef_ptr
  tao_CORBA_NativeDef_duplicate (
-     CORBA_NativeDef_ptr
+-    CORBA::NativeDef_ptr
++              CORBA_NativeDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_NativeDef_release (
-     CORBA_NativeDef_ptr
+-    CORBA::NativeDef_ptr
++              CORBA_NativeDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_NativeDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::NativeDef_ptr
++          CORBA_NativeDef_ptr
  tao_CORBA_NativeDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_NativeDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::NativeDef_ptr
++          CORBA_NativeDef_ptr
  tao_CORBA_NativeDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_NativeDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6082,24 +5702,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_ValueDef
+ // External declarations for undefined interface
+-// CORBA::ValueDef
++          // CORBA_ValueDef
  TAO_IFR_Client_Export
- CORBA_ValueDef_ptr
+-CORBA::ValueDef_ptr
++          CORBA_ValueDef_ptr
  tao_CORBA_ValueDef_duplicate (
-     CORBA_ValueDef_ptr
+-    CORBA::ValueDef_ptr
++              CORBA_ValueDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_ValueDef_release (
-     CORBA_ValueDef_ptr
+-    CORBA::ValueDef_ptr
++              CORBA_ValueDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ValueDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ValueDef_ptr
++          CORBA_ValueDef_ptr
  tao_CORBA_ValueDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ValueDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ValueDef_ptr
++          CORBA_ValueDef_ptr
  tao_CORBA_ValueDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_ValueDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6111,24 +5731,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_ValueBoxDef
+ // External declarations for undefined interface
+-// CORBA::ValueBoxDef
++          // CORBA_ValueBoxDef
  TAO_IFR_Client_Export
- CORBA_ValueBoxDef_ptr
+-CORBA::ValueBoxDef_ptr
++          CORBA_ValueBoxDef_ptr
  tao_CORBA_ValueBoxDef_duplicate (
-     CORBA_ValueBoxDef_ptr
+-    CORBA::ValueBoxDef_ptr
++              CORBA_ValueBoxDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_ValueBoxDef_release (
-     CORBA_ValueBoxDef_ptr
+-    CORBA::ValueBoxDef_ptr
++              CORBA_ValueBoxDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ValueBoxDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ValueBoxDef_ptr
++          CORBA_ValueBoxDef_ptr
  tao_CORBA_ValueBoxDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_ValueBoxDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::ValueBoxDef_ptr
++          CORBA_ValueBoxDef_ptr
  tao_CORBA_ValueBoxDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_ValueBoxDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6140,24 +5760,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_AbstractInterfaceDef
+ // External declarations for undefined interface
+-// CORBA::AbstractInterfaceDef
++          // CORBA_AbstractInterfaceDef
  TAO_IFR_Client_Export
- CORBA_AbstractInterfaceDef_ptr
+-CORBA::AbstractInterfaceDef_ptr
++          CORBA_AbstractInterfaceDef_ptr
  tao_CORBA_AbstractInterfaceDef_duplicate (
-     CORBA_AbstractInterfaceDef_ptr
+-    CORBA::AbstractInterfaceDef_ptr
++              CORBA_AbstractInterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_AbstractInterfaceDef_release (
-     CORBA_AbstractInterfaceDef_ptr
+-    CORBA::AbstractInterfaceDef_ptr
++              CORBA_AbstractInterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_AbstractInterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::AbstractInterfaceDef_ptr
++          CORBA_AbstractInterfaceDef_ptr
  tao_CORBA_AbstractInterfaceDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_AbstractInterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::AbstractInterfaceDef_ptr
++          CORBA_AbstractInterfaceDef_ptr
  tao_CORBA_AbstractInterfaceDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_AbstractInterfaceDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6169,24 +5789,24 @@
    );
  
--// External declarations for undefined interface
-+// Declarations for undefined interface
- // CORBA_LocalInterfaceDef
+ // External declarations for undefined interface
+-// CORBA::LocalInterfaceDef
++          // CORBA_LocalInterfaceDef
  TAO_IFR_Client_Export
- CORBA_LocalInterfaceDef_ptr
+-CORBA::LocalInterfaceDef_ptr
++          CORBA_LocalInterfaceDef_ptr
  tao_CORBA_LocalInterfaceDef_duplicate (
-     CORBA_LocalInterfaceDef_ptr
+-    CORBA::LocalInterfaceDef_ptr
++              CORBA_LocalInterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
+ TAO_IFR_Client_Export
  void
  tao_CORBA_LocalInterfaceDef_release (
-     CORBA_LocalInterfaceDef_ptr
+-    CORBA::LocalInterfaceDef_ptr
++              CORBA_LocalInterfaceDef_ptr
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_LocalInterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::LocalInterfaceDef_ptr
++          CORBA_LocalInterfaceDef_ptr
  tao_CORBA_LocalInterfaceDef_nil (
      void
    );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA_LocalInterfaceDef_ptr
+ TAO_IFR_Client_Export
+-CORBA::LocalInterfaceDef_ptr
++          CORBA_LocalInterfaceDef_ptr
  tao_CORBA_LocalInterfaceDef_narrow (
-     CORBA::Object *,
-     CORBA::Environment &
-   );
--extern TAO_IFR_Client_Export
-+TAO_IFR_Client_Export
- CORBA::Object *
- tao_CORBA_LocalInterfaceDef_upcast (
-     void *
+     CORBA::Object *
+     ACE_ENV_ARG_DECL_NOT_USED
+@@ -6199,293 +5819,288 @@
+ 
+ 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); // copying
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr *); // non-copying
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject_ptr &);
+-// 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); // copying
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr *); // non-copying
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained_ptr &);
+-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); // copying
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr *); // non-copying
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container_ptr &);
+-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); // copying
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr *); // non-copying
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IDLType_ptr &);
+-// Any operators for interface CORBA::TypedefDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr); // copying
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr *); // non-copying
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypedefDef_ptr &);
+-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::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 &);
++          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 &);
++          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 &
++              const CORBA_InterfaceDefSeq &
+   );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (
+     TAO_InputCDR &,
+-    CORBA::InterfaceDefSeq &
++              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 &);
++          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 &
++              const CORBA_ValueDefSeq &
+   );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (
+     TAO_InputCDR &,
+-    CORBA::ValueDefSeq &
++              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 &);
++          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 &
++              const CORBA_AbstractInterfaceDefSeq &
+   );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (
+     TAO_InputCDR &,
+-    CORBA::AbstractInterfaceDefSeq &
++              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 &);
++          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 &
++              const CORBA_LocalInterfaceDefSeq &
+   );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (
+     TAO_InputCDR &,
+-    CORBA::LocalInterfaceDefSeq &
++              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_ */
+@@ -6496,40 +6111,40 @@
+ 
+ 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/diffs/IFR_ComponentsC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
index 704fc1660a1..9fcca1b8874 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ComponentsC.cpp	Tue Apr 24 23:26:05 2001
-+++ IFR_ComponentsC.cpp	Fri May 11 01:22:20 2001
+--- orig/IFR_ComponentsC.cpp	Sat Mar 16 01:47:43 2002
++++ IFR_ComponentsC.cpp	Sat Mar 16 01:52:45 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,471 +8,6852 @@
  
  // ****  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"
-@@ -3095,9 +3093,9 @@
- {
-   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
-@@ -3906,8 +3904,8 @@
- {
-   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
-@@ -4124,24 +4122,23 @@
-   ACE_NTOHL (0x655f7479), 
-   ACE_NTOHL (0x70650000),  // name = interface_type
-   CORBA::tk_objref, // typecode kind
--  68, // encapsulation length
-+  64, // 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 (0x412f496e), 
-     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
-+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
+@@ -32,188 +32,13 @@
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+ 
+ #if defined (__BORLANDC__)
+-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
++#pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+ 
+ #if !defined (__ACE_INLINE__)
+ #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
+@@ -244,7 +69,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_ScopedName[] =
+@@ -277,7 +102,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_RepositoryId[] =
+@@ -311,7 +136,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_IR_RepositoryId)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -417,7 +242,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_VersionSpec[] =
+@@ -450,7 +275,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_VersionSpec, &_tc_TAO_tc_IR_VersionSpec)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_VersionSpec, &_tc_TAO_tc_IR_VersionSpec)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -647,7 +472,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_ComponentDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_ComponentDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -843,7 +668,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_ProvidesDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_ProvidesDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -1035,7 +860,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -1227,7 +1052,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -1420,7 +1245,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_EmitsDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_EmitsDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -1617,7 +1442,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_PublishesDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_PublishesDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -1813,7 +1638,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_ConsumesDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_ConsumesDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -2009,7 +1834,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_FactoryDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_FactoryDefSeq)
+ TAO_NAMESPACE_END
+ 
+ 
+@@ -2204,15 +2029,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::ComponentRepository::_tao_class_id = 0;
+-
+ IR::ComponentRepository_ptr
+ tao_IR_ComponentRepository_duplicate (
+     IR::ComponentRepository_ptr p
+@@ -2256,10 +2075,10 @@
+   return *tmp;
+ }
+ 
++int IR::ComponentRepository::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::ComponentRepository_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::ComponentRepository_var
+ // *************************************************************
+ 
+ IR::ComponentRepository_var::ComponentRepository_var (void) // default constructor
+@@ -2382,9 +2201,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::ComponentRepository_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::ComponentRepository_out
+ // *************************************************************
+ 
+ IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
+@@ -2454,16 +2271,23 @@
+       const char * name,
+       const char * version,
+       IR::ComponentDef_ptr base_component,
+-      const CORBA::InterfaceDefSeq & supports_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_InterfaceDefSeq & supports_interfaces
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ComponentDef_ptr result);
+@@ -2476,7 +2300,7 @@
+   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;
+ };
+ 
+@@ -2487,7 +2311,8 @@
+     const char * name,
+     const char * version,
+     IR::ComponentDef_ptr base_component,
+-    const CORBA::InterfaceDefSeq & supports_interfaces ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_InterfaceDefSeq & supports_interfaces
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -2542,6 +2367,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2559,7 +2385,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (::IR::ComponentDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -2576,16 +2402,23 @@
+       const char * version,
+       IR::HomeDef_ptr base_home,
+       IR::ComponentDef_ptr managed_component,
+-      CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_ValueDef_ptr primary_key
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::HomeDef_ptr result);
+@@ -2599,7 +2432,7 @@
+   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;
+ };
+ 
+@@ -2611,7 +2444,8 @@
+     const char * version,
+     IR::HomeDef_ptr base_home,
+     IR::ComponentDef_ptr managed_component,
+-    CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_ValueDef_ptr primary_key
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -2670,6 +2504,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -2687,7 +2522,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (::IR::HomeDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -2707,13 +2542,13 @@
+ 
+ // Remote Implementation of the IDL interface methods
+ 
+-::IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
++IR::ComponentDef_ptr IR::_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 CORBA::InterfaceDefSeq & supports_interfaces
++    const CORBA_InterfaceDefSeq & supports_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -2721,20 +2556,20 @@
+   ))
+ {
+   
+-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_component",
+       16,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -2754,29 +2589,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentRepository_create_component _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         base_component,
+-        supports_interfaces ACE_ENV_ARG_PARAMETER
++        supports_interfaces
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2790,13 +2626,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -2813,7 +2649,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -2826,9 +2662,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -2839,7 +2675,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -2850,13 +2686,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2864,15 +2700,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -2880,11 +2716,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -2894,17 +2730,17 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
++IR::HomeDef_ptr IR::_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,
+-    CORBA::ValueDef_ptr primary_key
++    CORBA_ValueDef_ptr primary_key
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -2912,20 +2748,20 @@
+   ))
+ {
+   
+-  IR::HomeDef_var _tao_retval (IR::HomeDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_home",
+       11,
+-      6,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -2945,7 +2781,7 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentRepository_create_home _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+@@ -2953,22 +2789,23 @@
+         version,
+         base_home,
+         managed_component,
+-        primary_key ACE_ENV_ARG_PARAMETER
++        primary_key
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -2982,13 +2819,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -3006,7 +2843,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3019,9 +2856,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3032,7 +2869,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3043,13 +2880,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3057,15 +2894,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3073,11 +2910,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3087,7 +2924,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -3143,14 +2980,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::ComponentRepository::ComponentRepository (int collocated)
+ {
+   this->IR_ComponentRepository_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::ComponentRepository::~ComponentRepository (void)
+ {}
+ 
+@@ -3190,8 +3026,7 @@
+   return ComponentRepository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::ComponentRepository_ptr 
+-IR::ComponentRepository::_unchecked_narrow (
++IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -3208,8 +3043,7 @@
+       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 () &&IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -3217,25 +3051,12 @@
+               ::IR::ComponentRepository (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              ComponentRepository::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::ComponentRepository (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              ComponentRepository::_nil ()
+-            );
++          ComponentRepository::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::ComponentRepository (stub, 0, obj->_servant ()), ComponentRepository::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -3284,37 +3105,37 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Repository::_tao_class_id))
++      &CORBA_Repository::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Container::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -3332,12 +3153,12 @@
+   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 CORBA::InterfaceDefSeq & supports_interfaces
++    const CORBA_InterfaceDefSeq & supports_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -3354,17 +3175,18 @@
+       name,
+       version,
+       base_component,
+-      supports_interfaces ACE_ENV_ARG_PARAMETER
++      supports_interfaces
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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,
+-    CORBA::ValueDef_ptr primary_key
++    CORBA_ValueDef_ptr primary_key
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -3382,7 +3204,8 @@
+       version,
+       base_home,
+       managed_component,
+-      primary_key ACE_ENV_ARG_PARAMETER
++      primary_key
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -3418,15 +3241,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::ProvidesDef::_tao_class_id = 0;
+-
+ IR::ProvidesDef_ptr
+ tao_IR_ProvidesDef_duplicate (
+     IR::ProvidesDef_ptr p
+@@ -3470,10 +3287,10 @@
+   return *tmp;
+ }
+ 
++int IR::ProvidesDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::ProvidesDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::ProvidesDef_var
+ // *************************************************************
+ 
+ IR::ProvidesDef_var::ProvidesDef_var (void) // default constructor
+@@ -3596,9 +3413,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::ProvidesDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::ProvidesDef_out
+ // *************************************************************
+ 
+ IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
+@@ -3663,30 +3478,38 @@
+ public:
+   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -3701,7 +3524,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -3716,6 +3538,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -3733,7 +3556,7 @@
+ }
+ 
+ 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;
+@@ -3753,7 +3576,7 @@
+ 
+ // 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_
+     ACE_ENV_ARG_DECL
+   )
+@@ -3762,13 +3585,13 @@
+   ))
+ {
+   
+-  CORBA::InterfaceDef_var _tao_retval (CORBA::InterfaceDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -3795,24 +3618,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3826,17 +3650,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -3849,9 +3673,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -3862,7 +3686,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -3873,13 +3697,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -3887,15 +3711,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -3903,11 +3727,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -3917,7 +3741,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -3973,14 +3797,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::ProvidesDef::ProvidesDef (int collocated)
+ {
+   this->IR_ProvidesDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::ProvidesDef::~ProvidesDef (void)
+ {}
+ 
+@@ -4020,8 +3843,7 @@
+   return ProvidesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::ProvidesDef_ptr 
+-IR::ProvidesDef::_unchecked_narrow (
++IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -4038,8 +3860,7 @@
+       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 () &&IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -4047,25 +3868,12 @@
+               ::IR::ProvidesDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              ProvidesDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::ProvidesDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              ProvidesDef::_nil ()
+-            );
++          ProvidesDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::ProvidesDef (stub, 0, obj->_servant ()), ProvidesDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -4113,25 +3921,25 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -4149,8 +3957,7 @@
+   return "IDL:omg.org/IR/ProvidesDef:1.0";
+ }
+ 
+-::CORBA::InterfaceDef_ptr IR::ProvidesDef::interface_type (
+-    
++CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -4162,7 +3969,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.interface_type (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -4194,7 +4002,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDef, &_tc_TAO_tc_IR_ProvidesDef)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_ProvidesDescription[] =
+@@ -4266,8 +4074,26 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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 (0x496e7465), 
-+    ACE_NTOHL (0x72666163), 
-+    ACE_NTOHL (0x65446566), 
-+    ACE_NTOHL (0x0),  // name = InterfaceDef
++    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
+@@ -4326,7 +4152,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
+ TAO_NAMESPACE_END
+ 
+ void IR::ProvidesDescription::_tao_any_destructor (void *_tao_void_pointer)
+@@ -4335,12 +4161,6 @@
+   delete tmp;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::UsesDef::_tao_class_id = 0;
+-
+ IR::UsesDef_ptr
+ tao_IR_UsesDef_duplicate (
+     IR::UsesDef_ptr p
+@@ -4384,10 +4204,10 @@
+   return *tmp;
+ }
+ 
++int IR::UsesDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::UsesDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::UsesDef_var
+ // *************************************************************
+ 
+ IR::UsesDef_var::UsesDef_var (void) // default constructor
+@@ -4510,9 +4330,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::UsesDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::UsesDef_out
+ // *************************************************************
+ 
+ IR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
+@@ -4577,30 +4395,38 @@
+ public:
+   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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;
  };
  
-@@ -5069,8 +5066,8 @@
- {
-   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
-@@ -5300,24 +5297,23 @@
-   ACE_NTOHL (0x655f7479), 
-   ACE_NTOHL (0x70650000),  // name = interface_type
-   CORBA::tk_objref, // typecode kind
--  68, // encapsulation length
-+  64, // 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 (0x412f496e), 
-     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
-+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
+ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -4615,7 +4441,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -4630,6 +4455,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -4647,7 +4473,7 @@
+ }
+ 
+ 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;
+@@ -4658,16 +4484,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::Boolean result);
+@@ -4681,7 +4514,8 @@
+ 
+ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -4696,7 +4530,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -4711,6 +4544,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -4748,7 +4582,7 @@
+ 
+ // 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_
+     ACE_ENV_ARG_DECL
+   )
+@@ -4757,13 +4591,13 @@
+   ))
+ {
+   
+-  CORBA::InterfaceDef_var _tao_retval (CORBA::InterfaceDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -4790,24 +4624,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_UsesDef_interface_type_get _tao_ri (
++      TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4821,17 +4656,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -4844,9 +4679,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -4857,7 +4692,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -4868,13 +4703,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -4882,15 +4717,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -4898,11 +4733,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -4912,7 +4747,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+@@ -4956,9 +4791,10 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get _tao_ri (
++      TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -4966,14 +4802,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -5010,9 +4846,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -5035,11 +4871,11 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           CORBA::Boolean _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -5047,15 +4883,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -5066,7 +4902,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -5133,14 +4969,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::UsesDef::UsesDef (int collocated)
+ {
+   this->IR_UsesDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::UsesDef::~UsesDef (void)
+ {}
+ 
+@@ -5180,8 +5015,7 @@
+   return UsesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::UsesDef_ptr 
+-IR::UsesDef::_unchecked_narrow (
++IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -5198,8 +5032,7 @@
+       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 () &&IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -5207,25 +5040,12 @@
+               ::IR::UsesDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              UsesDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::UsesDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              UsesDef::_nil ()
+-            );
++          UsesDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::UsesDef (stub, 0, obj->_servant ()), UsesDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -5273,25 +5093,25 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -5309,8 +5129,7 @@
+   return "IDL:omg.org/IR/UsesDef:1.0";
+ }
+ 
+-::CORBA::InterfaceDef_ptr IR::UsesDef::interface_type (
+-    
++CORBA_InterfaceDef_ptr IR::UsesDef::interface_type (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -5322,12 +5141,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.interface_type (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+ CORBA::Boolean IR::UsesDef::is_multiple (
+-    
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -5339,7 +5158,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.is_multiple (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -5369,7 +5189,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDef, &_tc_TAO_tc_IR_UsesDef)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_UsesDescription[] =
+@@ -5439,8 +5259,26 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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 (0x496e7465), 
-+    ACE_NTOHL (0x72666163), 
-+    ACE_NTOHL (0x65446566), 
-+    ACE_NTOHL (0x0),  // name = InterfaceDef
- 
-   12,
-   ACE_NTOHL (0x69735f6d), 
-@@ -5461,10 +5457,10 @@
++    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
+@@ -5505,7 +5343,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescription, &_tc_TAO_tc_IR_UsesDescription)
+ TAO_NAMESPACE_END
+ 
+ void IR::UsesDescription::_tao_any_destructor (void *_tao_void_pointer)
+@@ -5629,10 +5467,10 @@
    ACE_NTOHL (0x44657363), 
    ACE_NTOHL (0x53657100),  // name = ProvidesDescSeq
    CORBA::tk_sequence, // typecode kind
--  532, // encapsulation length
+-  460, // encapsulation length
 +  528, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
      CORBA::tk_struct, // typecode kind
--    516, // encapsulation length
+-    444, // encapsulation length
 +    512, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        39,
        ACE_NTOHL (0x49444c3a), 
-@@ -5580,24 +5576,23 @@
-       ACE_NTOHL (0x655f7479), 
-       ACE_NTOHL (0x70650000),  // name = interface_type
-       CORBA::tk_objref, // typecode kind
--      68, // encapsulation length
-+      64, // encapsulation length
+@@ -5700,22 +5538,40 @@
+       ACE_NTOHL (0x64656669), 
+       ACE_NTOHL (0x6e65645f), 
+       ACE_NTOHL (0x696e0000),  // name = defined_in
+-      0xffffffff, // indirection
+-      0xffffffa0, // negative offset (-96)
+-      8,
+-      ACE_NTOHL (0x76657273), 
+-      ACE_NTOHL (0x696f6e00),  // name = version
+       CORBA::tk_alias, // typecode kind for typedefs
+-      64, // encapsulation length
++      68, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
-         35,
+-        31,
++        32,
          ACE_NTOHL (0x49444c3a), 
          ACE_NTOHL (0x6f6d672e), 
          ACE_NTOHL (0x6f72672f), 
-         ACE_NTOHL (0x434f5242), 
--        ACE_NTOHL (0x415f496e), 
-+        ACE_NTOHL (0x412f496e), 
-         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
-+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
+-        ACE_NTOHL (0x49522f56), 
+-        ACE_NTOHL (0x65727369), 
+-        ACE_NTOHL (0x6f6e5370), 
+-        ACE_NTOHL (0x65633a31), 
++        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 (0x496e7465), 
-+        ACE_NTOHL (0x72666163), 
-+        ACE_NTOHL (0x65446566), 
-+        ACE_NTOHL (0x0),  // name = InterfaceDef
++        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
++      64, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        31,
++        ACE_NTOHL (0x49444c3a),
++        ACE_NTOHL (0x6f6d672e),
++        ACE_NTOHL (0x6f72672f),
++        ACE_NTOHL (0x49522f56),
++        ACE_NTOHL (0x65727369),
++        ACE_NTOHL (0x6f6e5370),
++        ACE_NTOHL (0x65633a31),
+         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
+         12,
+         ACE_NTOHL (0x56657273), 
+@@ -5763,7 +5619,7 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ProvidesDescSeq, &_tc_TAO_tc_IR_ProvidesDescSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescSeq, &_tc_TAO_tc_IR_ProvidesDescSeq)
+ TAO_NAMESPACE_END
  
  
-     0U,
-@@ -5730,10 +5725,10 @@
+@@ -5879,10 +5735,10 @@
    ACE_NTOHL (0x44657363), 
    ACE_NTOHL (0x53657100),  // name = UsesDescSeq
    CORBA::tk_sequence, // typecode kind
--  544, // encapsulation length
+-  472, // encapsulation length
 +  540, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
      CORBA::tk_struct, // typecode kind
--    528, // encapsulation length
+-    456, // encapsulation length
 +    524, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        35,
        ACE_NTOHL (0x49444c3a), 
-@@ -5847,24 +5842,23 @@
-       ACE_NTOHL (0x655f7479), 
-       ACE_NTOHL (0x70650000),  // name = interface_type
-       CORBA::tk_objref, // typecode kind
--      68, // encapsulation length
-+      64, // 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 (0x412f496e), 
-         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
-+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
+@@ -5948,8 +5804,26 @@
+       ACE_NTOHL (0x64656669), 
+       ACE_NTOHL (0x6e65645f), 
+       ACE_NTOHL (0x696e0000),  // name = defined_in
+-      0xffffffff, // indirection
+-      0xffffffa0, // negative offset (-96)
++      CORBA::tk_alias, // typecode kind for typedefs
++      68, // encapsulation length
++        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 (0x496e7465), 
-+        ACE_NTOHL (0x72666163), 
-+        ACE_NTOHL (0x65446566), 
-+        ACE_NTOHL (0x0),  // name = InterfaceDef
++        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
+@@ -6017,15 +5891,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::EventDef::_tao_class_id = 0;
+-
+ IR::EventDef_ptr
+ tao_IR_EventDef_duplicate (
+     IR::EventDef_ptr p
+@@ -6069,10 +5937,10 @@
+   return *tmp;
+ }
+ 
++int IR::EventDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::EventDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::EventDef_var
+ // *************************************************************
+ 
+ IR::EventDef_var::EventDef_var (void) // default constructor
+@@ -6195,9 +6063,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::EventDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::EventDef_out
+ // *************************************************************
+ 
+ IR::EventDef_out::EventDef_out (EventDef_ptr &p)
+@@ -6263,16 +6129,23 @@
+   TAO_ClientRequestInfo_IR_EventDef_is_a (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * event_id ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * event_id
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::Boolean result);
+@@ -6288,7 +6161,8 @@
+ 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 ACE_ENV_ARG_DECL_NOT_USED    
++    const char * event_id
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     event_id_ (event_id)
+@@ -6327,6 +6201,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -6355,30 +6230,38 @@
+ public:
+   TAO_ClientRequestInfo_IR_EventDef_event_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -6393,7 +6276,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -6408,6 +6290,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -6425,7 +6308,7 @@
+ }
+ 
+ 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;
+@@ -6487,10 +6370,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_EventDef_is_a _tao_ri (
++      TAO_ClientRequestInfo_IR_EventDef_is_a ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        event_id ACE_ENV_ARG_PARAMETER
++        event_id
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -6498,14 +6382,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -6551,9 +6435,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -6576,11 +6460,11 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           CORBA::Boolean _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -6588,15 +6472,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -6607,7 +6491,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -6621,7 +6505,7 @@
+ 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_
+     ACE_ENV_ARG_DECL
+   )
+@@ -6630,13 +6514,13 @@
+   ))
+ {
+   
+-  CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -6663,24 +6547,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_EventDef_event_get _tao_ri (
++      TAO_ClientRequestInfo_IR_EventDef_event_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -6694,17 +6579,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -6717,9 +6602,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -6730,7 +6615,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -6741,13 +6626,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -6755,15 +6640,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -6771,11 +6656,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -6785,7 +6670,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -6841,14 +6726,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::EventDef::EventDef (int collocated)
+ {
+   this->IR_EventDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::EventDef::~EventDef (void)
+ {}
+ 
+@@ -6888,8 +6772,7 @@
+   return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::EventDef_ptr 
+-IR::EventDef::_unchecked_narrow (
++IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -6906,8 +6789,7 @@
+       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 () &&IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -6915,25 +6797,12 @@
+               ::IR::EventDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              EventDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::EventDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              EventDef::_nil ()
+-            );
++          EventDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::EventDef (stub, 0, obj->_servant ()), EventDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -6981,25 +6850,25 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -7031,12 +6900,12 @@
+   
+   return proxy.is_a (
+       this,
+-      event_id ACE_ENV_ARG_PARAMETER
++      event_id
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::CORBA::ValueDef_ptr IR::EventDef::event (
+-    
++CORBA_ValueDef_ptr IR::EventDef::event (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -7048,7 +6917,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.event (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -7079,7 +6949,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_EventDef, &_tc_TAO_tc_IR_EventDef)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_EventDescription[] =
+@@ -7150,8 +7020,26 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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
++    CORBA::tk_string,
++    0U, // string length
++
+   8,
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
+@@ -7206,7 +7094,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_EventDescription, &_tc_TAO_tc_IR_EventDescription)
+ TAO_NAMESPACE_END
+ 
+ void IR::EventDescription::_tao_any_destructor (void *_tao_void_pointer)
+@@ -7215,12 +7103,6 @@
+   delete tmp;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::EmitsDef::_tao_class_id = 0;
+-
+ IR::EmitsDef_ptr
+ tao_IR_EmitsDef_duplicate (
+     IR::EmitsDef_ptr p
+@@ -7264,10 +7146,10 @@
+   return *tmp;
+ }
+ 
++int IR::EmitsDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::EmitsDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::EmitsDef_var
+ // *************************************************************
+ 
+ IR::EmitsDef_var::EmitsDef_var (void) // default constructor
+@@ -7390,9 +7272,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::EmitsDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::EmitsDef_out
+ // *************************************************************
+ 
+ IR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
+@@ -7519,14 +7399,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::EmitsDef::EmitsDef (int collocated)
+ {
+   this->IR_EmitsDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::EmitsDef::~EmitsDef (void)
+ {}
+ 
+@@ -7566,8 +7445,7 @@
+   return EmitsDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::EmitsDef_ptr 
+-IR::EmitsDef::_unchecked_narrow (
++IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -7584,8 +7462,7 @@
+       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 () &&IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -7593,25 +7470,12 @@
+               ::IR::EmitsDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              EmitsDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::EmitsDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              EmitsDef::_nil ()
+-            );
++          EmitsDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::EmitsDef (stub, 0, obj->_servant ()), EmitsDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -7672,25 +7536,25 @@
+       );
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -7735,15 +7599,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::PublishesDef::_tao_class_id = 0;
+-
+ IR::PublishesDef_ptr
+ tao_IR_PublishesDef_duplicate (
+     IR::PublishesDef_ptr p
+@@ -7787,10 +7645,10 @@
+   return *tmp;
+ }
+ 
++int IR::PublishesDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::PublishesDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::PublishesDef_var
+ // *************************************************************
+ 
+ IR::PublishesDef_var::PublishesDef_var (void) // default constructor
+@@ -7913,9 +7771,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::PublishesDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::PublishesDef_out
+ // *************************************************************
+ 
+ IR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
+@@ -8042,14 +7898,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::PublishesDef::PublishesDef (int collocated)
+ {
+   this->IR_PublishesDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::PublishesDef::~PublishesDef (void)
+ {}
+ 
+@@ -8089,8 +7944,7 @@
+   return PublishesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::PublishesDef_ptr 
+-IR::PublishesDef::_unchecked_narrow (
++IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -8107,8 +7961,7 @@
+       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 () &&IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -8116,25 +7969,12 @@
+               ::IR::PublishesDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              PublishesDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::PublishesDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              PublishesDef::_nil ()
+-            );
++          PublishesDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::PublishesDef (stub, 0, obj->_servant ()), PublishesDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -8195,25 +8035,25 @@
+       );
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -8260,15 +8100,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::ConsumesDef::_tao_class_id = 0;
+-
+ IR::ConsumesDef_ptr
+ tao_IR_ConsumesDef_duplicate (
+     IR::ConsumesDef_ptr p
+@@ -8312,10 +8146,10 @@
+   return *tmp;
+ }
+ 
++int IR::ConsumesDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::ConsumesDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::ConsumesDef_var
+ // *************************************************************
+ 
+ IR::ConsumesDef_var::ConsumesDef_var (void) // default constructor
+@@ -8438,9 +8272,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::ConsumesDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::ConsumesDef_out
+ // *************************************************************
+ 
+ IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
+@@ -8567,14 +8399,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::ConsumesDef::ConsumesDef (int collocated)
+ {
+   this->IR_ConsumesDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::ConsumesDef::~ConsumesDef (void)
+ {}
+ 
+@@ -8614,8 +8445,7 @@
+   return ConsumesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::ConsumesDef_ptr 
+-IR::ConsumesDef::_unchecked_narrow (
++IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -8632,8 +8462,7 @@
+       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 () &&IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -8641,25 +8470,12 @@
+               ::IR::ConsumesDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              ConsumesDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::ConsumesDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              ConsumesDef::_nil ()
+-            );
++          ConsumesDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::ConsumesDef (stub, 0, obj->_servant ()), ConsumesDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -8720,25 +8536,25 @@
+       );
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -8784,15 +8600,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::ComponentDef::_tao_class_id = 0;
+-
+ IR::ComponentDef_ptr
+ tao_IR_ComponentDef_duplicate (
+     IR::ComponentDef_ptr p
+@@ -8836,10 +8646,10 @@
+   return *tmp;
+ }
+ 
++int IR::ComponentDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::ComponentDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::ComponentDef_var
+ // *************************************************************
+ 
+ IR::ComponentDef_var::ComponentDef_var (void) // default constructor
+@@ -8962,9 +8772,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::ComponentDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::ComponentDef_out
+ // *************************************************************
+ 
+ IR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
+@@ -9029,30 +8837,38 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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 (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9067,7 +8883,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9082,6 +8897,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9099,7 +8915,7 @@
+ }
+ 
+ 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;
+@@ -9111,30 +8927,38 @@
+   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_InterfaceDefSeq & supported_interfaces
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+ 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 ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_InterfaceDefSeq & supported_interfaces
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     supported_interfaces_ (supported_interfaces)
+@@ -9173,6 +8997,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9191,16 +9016,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ComponentDef_ptr result);
+@@ -9214,7 +9046,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9229,7 +9062,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9244,6 +9076,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9261,7 +9094,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (::IR::ComponentDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9272,16 +9105,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ProvidesDefSeq * result);
+@@ -9295,7 +9135,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9310,7 +9151,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9325,6 +9165,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9342,7 +9183,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (::IR::ProvidesDefSeq * result)
++TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9353,16 +9194,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::UsesDefSeq * result);
+@@ -9376,7 +9224,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9391,7 +9240,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9406,6 +9254,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9423,7 +9272,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (::IR::UsesDefSeq * result)
++TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9434,16 +9283,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::EmitsDefSeq * result);
+@@ -9457,7 +9313,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9472,7 +9329,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9487,6 +9343,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9504,7 +9361,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (::IR::EmitsDefSeq * result)
++TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9515,16 +9372,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::PublishesDefSeq * result);
+@@ -9538,7 +9402,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9553,7 +9418,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9568,6 +9432,7 @@
+   return exception_list;
+ }
  
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9585,7 +9450,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (::IR::PublishesDefSeq * result)
++TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9596,16 +9461,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ConsumesDefSeq * result);
+@@ -9619,7 +9491,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9634,7 +9507,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9649,6 +9521,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9666,7 +9539,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (::IR::ConsumesDefSeq * result)
++TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9677,16 +9550,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::Boolean result);
+@@ -9700,7 +9580,8 @@
+ 
+ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -9715,7 +9596,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -9730,6 +9610,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9762,16 +9643,23 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_InterfaceDef_ptr interface_type
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ProvidesDef_ptr result);
+@@ -9783,7 +9671,7 @@
+   const char * id_;
+   const char * name_;
+   const char * version_;
+-  CORBA::InterfaceDef_ptr interface_type_;
++  CORBA_InterfaceDef_ptr interface_type_;
+   IR::ProvidesDef_ptr _result;
+ };
+ 
+@@ -9793,7 +9681,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_InterfaceDef_ptr interface_type
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -9844,6 +9733,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9861,7 +9751,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (::IR::ProvidesDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9876,17 +9766,24 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::InterfaceDef_ptr interface_type,
+-      const CORBA::Boolean & is_multiple ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_InterfaceDef_ptr interface_type,
++      const CORBA::Boolean & is_multiple
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::UsesDef_ptr result);
+@@ -9898,7 +9795,7 @@
+   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;
+ };
+@@ -9909,8 +9806,9 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::InterfaceDef_ptr interface_type,
+-    const CORBA::Boolean & is_multiple ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_InterfaceDef_ptr interface_type,
++    const CORBA::Boolean & is_multiple
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -9965,6 +9863,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -9982,7 +9881,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (::IR::UsesDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -9997,16 +9896,23 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_ValueDef_ptr value
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::EmitsDef_ptr result);
+@@ -10018,7 +9924,7 @@
+   const char * id_;
+   const char * name_;
+   const char * version_;
+-  CORBA::ValueDef_ptr value_;
++  CORBA_ValueDef_ptr value_;
+   IR::EmitsDef_ptr _result;
+ };
+ 
+@@ -10028,7 +9934,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_ValueDef_ptr value
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -10079,6 +9986,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -10096,7 +10004,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (::IR::EmitsDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -10111,16 +10019,23 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_ValueDef_ptr value
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::PublishesDef_ptr result);
+@@ -10132,7 +10047,7 @@
+   const char * id_;
+   const char * name_;
+   const char * version_;
+-  CORBA::ValueDef_ptr value_;
++  CORBA_ValueDef_ptr value_;
+   IR::PublishesDef_ptr _result;
+ };
+ 
+@@ -10142,7 +10057,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_ValueDef_ptr value
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -10193,6 +10109,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -10210,7 +10127,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (::IR::PublishesDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -10225,16 +10142,23 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_ValueDef_ptr value
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ConsumesDef_ptr result);
+@@ -10246,7 +10170,7 @@
+   const char * id_;
+   const char * name_;
+   const char * version_;
+-  CORBA::ValueDef_ptr value_;
++  CORBA_ValueDef_ptr value_;
+   IR::ConsumesDef_ptr _result;
+ };
+ 
+@@ -10256,7 +10180,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_ValueDef_ptr value
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -10307,6 +10232,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -10324,7 +10250,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (::IR::ConsumesDef_ptr result)
++TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -10344,7 +10270,7 @@
+ 
+ // 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_
+     ACE_ENV_ARG_DECL
+   )
+@@ -10353,19 +10279,16 @@
+   ))
+ {
+   
+-  CORBA::InterfaceDefSeq_var _tao_retval;
++  CORBA_InterfaceDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    CORBA::InterfaceDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -10390,24 +10313,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10421,17 +10345,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10444,9 +10368,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10457,7 +10381,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10468,13 +10392,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10482,15 +10406,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10498,11 +10422,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10512,12 +10436,12 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+     CORBA_Object *_collocated_tao_target_,
+-    const CORBA::InterfaceDefSeq & supported_interfaces
++    const CORBA_InterfaceDefSeq & supported_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -10557,10 +10481,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        supported_interfaces ACE_ENV_ARG_PARAMETER
++        supported_interfaces
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK;
+ 
+@@ -10568,14 +10493,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10619,9 +10544,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10633,9 +10558,9 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10643,15 +10568,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10662,7 +10587,7 @@
+         ACE_CHECK;
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK;
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -10676,7 +10601,7 @@
+ 
+ }
+ 
+-::IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
++IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -10685,13 +10610,13 @@
+   ))
+ {
+   
+-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -10718,24 +10643,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_base_component_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10749,17 +10675,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10772,9 +10698,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10785,7 +10711,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10796,13 +10722,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10810,15 +10736,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10826,11 +10752,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -10840,10 +10766,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
++IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -10852,19 +10778,16 @@
+   ))
+ {
+   
+-  IR::ProvidesDefSeq_var _tao_retval;
++  IR::ProvidesDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::ProvidesDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::ProvidesDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -10889,24 +10812,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10920,17 +10844,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -10943,9 +10867,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -10956,7 +10880,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -10967,13 +10891,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -10981,15 +10905,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -10997,11 +10921,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11011,10 +10935,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
++IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -11023,19 +10947,16 @@
+   ))
+ {
+   
+-  IR::UsesDefSeq_var _tao_retval;
++  IR::UsesDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::UsesDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::UsesDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -11060,24 +10981,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11091,17 +11013,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11114,9 +11036,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11127,7 +11049,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11138,13 +11060,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11152,15 +11074,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11168,11 +11090,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11182,10 +11104,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
++IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -11194,19 +11116,16 @@
+   ))
+ {
+   
+-  IR::EmitsDefSeq_var _tao_retval;
++  IR::EmitsDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::EmitsDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::EmitsDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -11231,24 +11150,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11262,17 +11182,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11285,9 +11205,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11298,7 +11218,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11309,13 +11229,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11323,15 +11243,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11339,11 +11259,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11353,10 +11273,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
++IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -11365,19 +11285,16 @@
+   ))
+ {
+   
+-  IR::PublishesDefSeq_var _tao_retval;
++  IR::PublishesDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::PublishesDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::PublishesDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -11402,24 +11319,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11433,17 +11351,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11456,9 +11374,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11469,7 +11387,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11480,13 +11398,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11494,15 +11412,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11510,11 +11428,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11524,10 +11442,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
++IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -11536,19 +11454,16 @@
+   ))
+ {
+   
+-  IR::ConsumesDefSeq_var _tao_retval;
++  IR::ConsumesDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::ConsumesDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::ConsumesDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -11573,24 +11488,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11604,17 +11520,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11627,9 +11543,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11640,7 +11556,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -11651,13 +11567,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11665,15 +11581,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11681,11 +11597,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -11695,7 +11611,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
+@@ -11739,9 +11655,10 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -11749,14 +11666,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11793,9 +11710,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11818,11 +11735,11 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           CORBA::Boolean _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11830,15 +11747,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -11849,7 +11766,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -11863,12 +11780,12 @@
+ return _tao_retval;
+ }
+ 
+-::IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
++IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::InterfaceDef_ptr interface_type
++    CORBA_InterfaceDef_ptr interface_type
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -11876,20 +11793,20 @@
+   ))
+ {
+   
+-  IR::ProvidesDef_var _tao_retval (IR::ProvidesDef::_nil ());
+-
++  IR::ProvidesDef_ptr _tao_retval = IR::ProvidesDef::_nil ();
++  IR::ProvidesDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_provides",
+       15,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -11909,28 +11826,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_create_provides _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        interface_type ACE_ENV_ARG_PARAMETER
++        interface_type
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -11944,13 +11862,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -11966,7 +11884,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -11979,9 +11897,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -11992,7 +11910,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12003,13 +11921,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12017,15 +11935,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12033,11 +11951,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12047,15 +11965,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
++IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::InterfaceDef_ptr interface_type,
++    CORBA_InterfaceDef_ptr interface_type,
+     CORBA::Boolean is_multiple
+     ACE_ENV_ARG_DECL
+   )
+@@ -12064,20 +11982,20 @@
+   ))
+ {
+   
+-  IR::UsesDef_var _tao_retval (IR::UsesDef::_nil ());
+-
++  IR::UsesDef_ptr _tao_retval = IR::UsesDef::_nil ();
++  IR::UsesDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_uses",
+       11,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12097,29 +12015,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_create_uses _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         interface_type,
+-        is_multiple ACE_ENV_ARG_PARAMETER
++        is_multiple
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12133,13 +12052,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12156,7 +12075,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12169,9 +12088,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12182,7 +12101,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12193,13 +12112,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12207,15 +12126,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12223,11 +12142,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12237,15 +12156,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
++IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -12253,20 +12172,20 @@
+   ))
+ {
+   
+-  IR::EmitsDef_var _tao_retval (IR::EmitsDef::_nil ());
+-
++  IR::EmitsDef_ptr _tao_retval = IR::EmitsDef::_nil ();
++  IR::EmitsDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_emits",
        12,
-       ACE_NTOHL (0x69735f6d), 
-@@ -6818,8 +6812,8 @@
- {
-   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
-@@ -7051,22 +7045,21 @@
-   ACE_NTOHL (0x76616c75), 
-   ACE_NTOHL (0x65000000),  // name = value
-   CORBA::tk_objref, // typecode kind
--  60, // encapsulation length
-+  56, // encapsulation length
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12286,28 +12205,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_create_emits _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        value ACE_ENV_ARG_PARAMETER
++        value
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12321,13 +12241,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12343,7 +12263,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12356,9 +12276,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12369,7 +12289,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12380,13 +12300,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12394,15 +12314,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12410,11 +12330,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12424,15 +12344,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
++IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -12440,20 +12360,20 @@
+   ))
+ {
+   
+-  IR::PublishesDef_var _tao_retval (IR::PublishesDef::_nil ());
+-
++  IR::PublishesDef_ptr _tao_retval = IR::PublishesDef::_nil ();
++  IR::PublishesDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_publishes",
+       16,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12473,28 +12393,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_create_publishes _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        value ACE_ENV_ARG_PARAMETER
++        value
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12508,13 +12429,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12530,7 +12451,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12543,9 +12464,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12556,7 +12477,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12567,13 +12488,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12581,15 +12502,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12597,11 +12518,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12611,15 +12532,15 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
++IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -12627,20 +12548,20 @@
+   ))
+ {
+   
+-  IR::ConsumesDef_var _tao_retval (IR::ConsumesDef::_nil ());
+-
++  IR::ConsumesDef_ptr _tao_retval = IR::ConsumesDef::_nil ();
++  IR::ConsumesDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_consumes",
+       15,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -12660,28 +12581,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_ComponentDef_create_consumes _tao_ri (
++      TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        value ACE_ENV_ARG_PARAMETER
++        value
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12695,13 +12617,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -12717,7 +12639,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -12730,9 +12652,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -12743,7 +12665,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -12754,13 +12676,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -12768,15 +12690,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -12784,11 +12706,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -12798,7 +12720,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -12854,14 +12776,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::ComponentDef::ComponentDef (int collocated)
+ {
+   this->IR_ComponentDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::ComponentDef::~ComponentDef (void)
+ {}
+ 
+@@ -12901,8 +12822,7 @@
+   return ComponentDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::ComponentDef_ptr 
+-IR::ComponentDef::_unchecked_narrow (
++IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -12919,8 +12839,7 @@
+       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 () &&IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -12928,25 +12847,12 @@
+               ::IR::ComponentDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              ComponentDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::ComponentDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              ComponentDef::_nil ()
+-            );
++          ComponentDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::ComponentDef (stub, 0, obj->_servant ()), ComponentDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -12997,61 +12903,61 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::InterfaceDef::_tao_class_id))
++      &CORBA_InterfaceDef::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Container::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IDLType::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -13069,8 +12975,7 @@
+   return "IDL:omg.org/IR/ComponentDef:1.0";
+ }
+ 
+-::CORBA::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
+-    
++CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13082,12 +12987,13 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.supported_interfaces (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+ void IR::ComponentDef::supported_interfaces (
+-    const CORBA::InterfaceDefSeq & supported_interfaces
++    const CORBA_InterfaceDefSeq & supported_interfaces
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13100,12 +13006,12 @@
+   
+   proxy.supported_interfaces (
+       this,
+-      supported_interfaces ACE_ENV_ARG_PARAMETER
++      supported_interfaces
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ComponentDef_ptr IR::ComponentDef::base_component (
+-    
++IR::ComponentDef_ptr IR::ComponentDef::base_component (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13117,12 +13023,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.base_component (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
+-    
++IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13134,12 +13040,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.provides_interfaces (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
+-    
++IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13151,12 +13057,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.uses_interfaces (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::EmitsDefSeq * IR::ComponentDef::emits_events (
+-    
++IR::EmitsDefSeq * IR::ComponentDef::emits_events (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13168,12 +13074,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.emits_events (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
+-    
++IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13185,12 +13091,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.publishes_events (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
+-    
++IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13202,12 +13108,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.consumes_events (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+ CORBA::Boolean IR::ComponentDef::is_basic (
+-    
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13219,15 +13125,16 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.is_basic (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
++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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13243,15 +13150,16 @@
+       id,
+       name,
+       version,
+-      interface_type ACE_ENV_ARG_PARAMETER
++      interface_type
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::UsesDef_ptr IR::ComponentDef::create_uses (
++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
+     ACE_ENV_ARG_DECL
+   )
+@@ -13269,15 +13177,16 @@
+       name,
+       version,
+       interface_type,
+-      is_multiple ACE_ENV_ARG_PARAMETER
++      is_multiple
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::EmitsDef_ptr IR::ComponentDef::create_emits (
++IR::EmitsDef_ptr IR::ComponentDef::create_emits (
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13293,15 +13202,16 @@
+       id,
+       name,
+       version,
+-      value ACE_ENV_ARG_PARAMETER
++      value
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
++IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13317,15 +13227,16 @@
+       id,
+       name,
+       version,
+-      value ACE_ENV_ARG_PARAMETER
++      value
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
++IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr value
++    CORBA_ValueDef_ptr value
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -13341,7 +13252,8 @@
+       id,
+       name,
+       version,
+-      value ACE_ENV_ARG_PARAMETER
++      value
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -13374,7 +13286,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDef, &_tc_TAO_tc_IR_ComponentDef)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_ComponentDescription[] =
+@@ -13447,8 +13359,26 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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
++    CORBA::tk_string,
++    0U, // string length
++
+   8,
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
+@@ -13476,8 +13406,26 @@
+   ACE_NTOHL (0x5f636f6d), 
+   ACE_NTOHL (0x706f6e65), 
+   ACE_NTOHL (0x6e740000),  // name = base_component
+-  0xffffffff, // indirection
+-  0xffffff30, // negative offset (-208)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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
++    CORBA::tk_string,
++    0U, // string length
++
+   20,
+   ACE_NTOHL (0x73757070), 
+   ACE_NTOHL (0x6f727473), 
+@@ -13485,7 +13433,7 @@
+   ACE_NTOHL (0x65726661), 
+   ACE_NTOHL (0x63657300),  // name = supports_interfaces
+   CORBA::tk_alias, // typecode kind for typedefs
+-  88, // encapsulation length
++  156, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
-     31,
+     35,
      ACE_NTOHL (0x49444c3a), 
-     ACE_NTOHL (0x6f6d672e), 
-     ACE_NTOHL (0x6f72672f), 
-     ACE_NTOHL (0x434f5242), 
--    ACE_NTOHL (0x415f5661), 
-+    ACE_NTOHL (0x412f5661), 
-     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
-+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-+    9,
-+    ACE_NTOHL (0x56616c75), 
-+    ACE_NTOHL (0x65446566), 
-+    ACE_NTOHL (0x0),  // name = ValueDef
+@@ -13503,10 +13451,28 @@
+     ACE_NTOHL (0x72794964), 
+     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
+     CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
++    84, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_alias, // typecode kind for typedefs
++      68, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+-      0xffffffff, // indirection
+-      0xfffffebc, // negative offset (-324)
++        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
++        CORBA::tk_string,
++        0U, // string length
++
+       0U,
  
- };
  
-@@ -7491,8 +7484,8 @@
-   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
-@@ -7988,8 +7981,8 @@
-   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
-@@ -8487,8 +8480,8 @@
-   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
-@@ -12834,11 +12827,11 @@
- {
-   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
-@@ -13521,75 +13514,146 @@
+@@ -13604,7 +13570,7 @@
    ACE_NTOHL (0x69627574), 
    ACE_NTOHL (0x65730000),  // name = attributes
    CORBA::tk_alias, // typecode kind for typedefs
--  416, // encapsulation length
+-  612, // encapsulation length
 +  1852, // 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
+@@ -13625,10 +13591,10 @@
+     ACE_NTOHL (0x696f6e53), 
+     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
      CORBA::tk_sequence, // typecode kind
--    324, // encapsulation length
+-    528, // encapsulation length
 +    1768, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
--      308, // encapsulation length
+-      512, // encapsulation length
 +      1752, // 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
+@@ -13649,7 +13615,7 @@
+         ACE_NTOHL (0x63726970), 
+         ACE_NTOHL (0x74696f6e), 
+         ACE_NTOHL (0x0),  // name = AttributeDescription
 -        6, // member count
-+        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
 +        8, // 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,
+@@ -13700,8 +13666,27 @@
          ACE_NTOHL (0x64656669), 
          ACE_NTOHL (0x6e65645f), 
          ACE_NTOHL (0x696e0000),  // name = defined_in
+-        0xffffffff, // indirection
+-        0xffffff9c, // negative offset (-100)
 +        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 (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 (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
-+
-         5,
-         ACE_NTOHL (0x74797065), 
-         ACE_NTOHL (0x0),  // name = type
-@@ -13627,108 +13691,416 @@
+@@ -13762,289 +13747,591 @@
            ACE_NTOHL (0x444f4e4c), 
            ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
  
@@ -486,9 +6867,9 @@
 -  ACE_NTOHL (0x656e7473), 
 -  ACE_NTOHL (0x0),  // name = emits_events
 +        15,
-+        ACE_NTOHL (0x6765745f), 
-+        ACE_NTOHL (0x65786365), 
-+        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x6765745f),
++        ACE_NTOHL (0x65786365),
++        ACE_NTOHL (0x7074696f),
 +        ACE_NTOHL (0x6e730000),  // name = get_exceptions
    CORBA::tk_alias, // typecode kind for typedefs
 -  132, // encapsulation length
@@ -508,18 +6889,18 @@
 -    ACE_NTOHL (0x456d6974), 
 -    ACE_NTOHL (0x73446566), 
 -    ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x412f4578), 
-+          ACE_NTOHL (0x63446573), 
-+          ACE_NTOHL (0x63726970), 
-+          ACE_NTOHL (0x74696f6e), 
-+          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x434f5242),
++          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
 +          18,
-+          ACE_NTOHL (0x45786344), 
-+          ACE_NTOHL (0x65736372), 
-+          ACE_NTOHL (0x69707469), 
-+          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x45786344),
++          ACE_NTOHL (0x65736372),
++          ACE_NTOHL (0x69707469),
++          ACE_NTOHL (0x6f6e5365),
 +          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
      CORBA::tk_sequence, // typecode kind
 -    68, // encapsulation length
@@ -546,38 +6927,58 @@
 -
 -      0U,
 -
--
--  17,
--  ACE_NTOHL (0x7075626c), 
--  ACE_NTOHL (0x69736865), 
--  ACE_NTOHL (0x735f6576), 
--  ACE_NTOHL (0x656e7473), 
--  ACE_NTOHL (0x0),  // name = publishes_events
-+              ACE_NTOHL (0x434f5242), 
-+              ACE_NTOHL (0x412f4578), 
-+              ACE_NTOHL (0x63657074), 
-+              ACE_NTOHL (0x696f6e44), 
-+              ACE_NTOHL (0x65736372), 
-+              ACE_NTOHL (0x69707469), 
-+              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x434f5242),
++              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
 +              21,
-+              ACE_NTOHL (0x45786365), 
-+              ACE_NTOHL (0x7074696f), 
-+              ACE_NTOHL (0x6e446573), 
-+              ACE_NTOHL (0x63726970), 
-+              ACE_NTOHL (0x74696f6e), 
++              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 (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
+ 
+-  17,
+-  ACE_NTOHL (0x7075626c), 
+-  ACE_NTOHL (0x69736865), 
+-  ACE_NTOHL (0x735f6576), 
+-  ACE_NTOHL (0x656e7473), 
+-  ACE_NTOHL (0x0),  // name = publishes_events
++              3,
++              ACE_NTOHL (0x69640000),  // name = id
    CORBA::tk_alias, // typecode kind for typedefs
 -  148, // encapsulation length
-+              68, // encapsulation length
++              72, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
--    35,
-+                33,
+     35,
      ACE_NTOHL (0x49444c3a), 
      ACE_NTOHL (0x6f6d672e), 
      ACE_NTOHL (0x6f72672f), 
@@ -597,22 +6998,25 @@
 -      TAO_ENCAP_BYTE_ORDER, // byte order
 -      CORBA::tk_objref, // typecode kind
 -      60, // encapsulation length
-+                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, 
++                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
 +
-+              3,
-+              ACE_NTOHL (0x69640000),  // name = id
-+              CORBA::tk_alias, // typecode kind for typedefs
++              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
 -        32,
@@ -625,268 +7029,388 @@
 -        ACE_NTOHL (0x73686573), 
 -        ACE_NTOHL (0x4465663a), 
 -        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
-+                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x412f5265), 
-+                ACE_NTOHL (0x706f7369), 
-+                ACE_NTOHL (0x746f7279), 
-+                ACE_NTOHL (0x49643a31), 
++                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 (0x5075626c), 
 -        ACE_NTOHL (0x69736865), 
 -        ACE_NTOHL (0x73446566), 
 -        ACE_NTOHL (0x0),  // name = PublishesDef
--
--      0U,
--
-+                ACE_NTOHL (0x5265706f), 
-+                ACE_NTOHL (0x7369746f), 
-+                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x5265706f),
++                ACE_NTOHL (0x7369746f),
++                ACE_NTOHL (0x72794964),
 +                ACE_NTOHL (0x0),  // name = RepositoryId
-+                CORBA::tk_string, 
-+                0U, // string length
- 
--  16,
--  ACE_NTOHL (0x636f6e73), 
--  ACE_NTOHL (0x756d6573), 
--  ACE_NTOHL (0x5f657665), 
--  ACE_NTOHL (0x6e747300),  // name = consumes_events
-+              11,
-+              ACE_NTOHL (0x64656669), 
-+              ACE_NTOHL (0x6e65645f), 
-+              ACE_NTOHL (0x696e0000),  // name = defined_in
-   CORBA::tk_alias, // typecode kind for typedefs
--  144, // encapsulation length
-+              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, 
++                CORBA::tk_string,
 +                0U, // string length
 +
 +              8,
-+              ACE_NTOHL (0x76657273), 
++              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 (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 (0x56657273),
++                ACE_NTOHL (0x696f6e53),
 +                ACE_NTOHL (0x70656300),  // name = VersionSpec
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
 +
 +              5,
-+              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x74797065),
 +              ACE_NTOHL (0x0),  // name = type
 +              CORBA::tk_TypeCode,
 +
-+
-+            0U,
-+
-+
+ 
+       0U,
+ 
+ 
+-  16,
+-  ACE_NTOHL (0x636f6e73), 
+-  ACE_NTOHL (0x756d6573), 
+-  ACE_NTOHL (0x5f657665), 
+-  ACE_NTOHL (0x6e747300),  // name = consumes_events
 +        15,
-+        ACE_NTOHL (0x7075745f), 
-+        ACE_NTOHL (0x65786365), 
-+        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x7075745f),
++        ACE_NTOHL (0x65786365),
++        ACE_NTOHL (0x7074696f),
 +        ACE_NTOHL (0x6e730000),  // name = put_exceptions
-+        CORBA::tk_alias, // typecode kind for typedefs
+   CORBA::tk_alias, // typecode kind for typedefs
+-  144, // encapsulation length
 +        556, // encapsulation length
-+          TAO_ENCAP_BYTE_ORDER, // byte order
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    34,
 +          40,
-+          ACE_NTOHL (0x49444c3a), 
-+          ACE_NTOHL (0x6f6d672e), 
-+          ACE_NTOHL (0x6f72672f), 
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x412f4578), 
-+          ACE_NTOHL (0x63446573), 
-+          ACE_NTOHL (0x63726970), 
-+          ACE_NTOHL (0x74696f6e), 
-+          ACE_NTOHL (0x5365713a), 
+     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
++          ACE_NTOHL (0x434f5242),
++          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
 +          18,
-+          ACE_NTOHL (0x45786344), 
-+          ACE_NTOHL (0x65736372), 
-+          ACE_NTOHL (0x69707469), 
-+          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x45786344),
++          ACE_NTOHL (0x65736372),
++          ACE_NTOHL (0x69707469),
++          ACE_NTOHL (0x6f6e5365),
 +          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-+          CORBA::tk_sequence, // typecode kind
+     CORBA::tk_sequence, // typecode kind
+-    72, // encapsulation length
 +          476, // encapsulation length
-+            TAO_ENCAP_BYTE_ORDER, // byte order
+       TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_objref, // typecode kind
+-      56, // encapsulation length
 +            CORBA::tk_struct, // typecode kind
 +            460, // encapsulation length
-+              TAO_ENCAP_BYTE_ORDER, // byte order
+         TAO_ENCAP_BYTE_ORDER, // byte order
+-        31,
 +              43,
-+              ACE_NTOHL (0x49444c3a), 
-+              ACE_NTOHL (0x6f6d672e), 
-+              ACE_NTOHL (0x6f72672f), 
-+              ACE_NTOHL (0x434f5242), 
-+              ACE_NTOHL (0x412f4578), 
-+              ACE_NTOHL (0x63657074), 
-+              ACE_NTOHL (0x696f6e44), 
-+              ACE_NTOHL (0x65736372), 
-+              ACE_NTOHL (0x69707469), 
-+              ACE_NTOHL (0x6f6e3a31), 
+         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
+-
+-      0U,
+-
+-
+-  9,
+-  ACE_NTOHL (0x69735f62), 
+-  ACE_NTOHL (0x61736963), 
+-  ACE_NTOHL (0x0),  // name = is_basic
+-  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)
+-  );
+-
+-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 *_tao_void_pointer)
+-{
+-  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*, _tao_void_pointer);
+-  delete tmp;
+-}
+-
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::PrimaryKeyDef::_tao_class_id = 0;
+-
+-IR::PrimaryKeyDef_ptr
+-tao_IR_PrimaryKeyDef_duplicate (
+-    IR::PrimaryKeyDef_ptr p
+-  )
+-{
+-  return IR::PrimaryKeyDef::_duplicate (p);
+-}
+-
+-void
+-tao_IR_PrimaryKeyDef_release (
+-    IR::PrimaryKeyDef_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-IR::PrimaryKeyDef_ptr
+-tao_IR_PrimaryKeyDef_nil (
+-    void
+-  )
+-{
+-  return IR::PrimaryKeyDef::_nil ();
+-}
++              ACE_NTOHL (0x434f5242),
++              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
 +              21,
-+              ACE_NTOHL (0x45786365), 
-+              ACE_NTOHL (0x7074696f), 
-+              ACE_NTOHL (0x6e446573), 
-+              ACE_NTOHL (0x63726970), 
-+              ACE_NTOHL (0x74696f6e), 
++              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 (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 (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 (0x4964656e),
++                ACE_NTOHL (0x74696669),
 +                ACE_NTOHL (0x65720000),  // name = Identifier
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
-+
+ 
+-IR::PrimaryKeyDef_ptr
+-tao_IR_PrimaryKeyDef_narrow (
+-    CORBA::Object *p
+-    ACE_ENV_ARG_DECL
+-  )
+-{
+-  return IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+-}
 +              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 (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 (0x5265706f),
++                ACE_NTOHL (0x7369746f),
++                ACE_NTOHL (0x72794964),
 +                ACE_NTOHL (0x0),  // name = RepositoryId
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
-+
+ 
+-CORBA::Object *
+-tao_IR_PrimaryKeyDef_upcast (
+-    void *src
+-  )
+-{
+-  IR::PrimaryKeyDef **tmp =
+-    ACE_static_cast (IR::PrimaryKeyDef **, src);
+-  return *tmp;
+-}
 +              11,
-+              ACE_NTOHL (0x64656669), 
-+              ACE_NTOHL (0x6e65645f), 
++              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 (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 (0x5265706f),
++                ACE_NTOHL (0x7369746f),
++                ACE_NTOHL (0x72794964),
 +                ACE_NTOHL (0x0),  // name = RepositoryId
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
-+
+ 
+-// *************************************************************
+-// IR::PrimaryKeyDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
+-// *************************************************************
 +              8,
-+              ACE_NTOHL (0x76657273), 
++              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 (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 (0x56657273),
++                ACE_NTOHL (0x696f6e53),
 +                ACE_NTOHL (0x70656300),  // name = VersionSpec
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
-+
+ 
+-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void) // default constructor
+-  : ptr_ (PrimaryKeyDef::_nil ())
+-{}
 +              5,
-+              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x74797065),
 +              ACE_NTOHL (0x0),  // name = type
 +              CORBA::tk_TypeCode,
-+
-+
+ 
+-::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 ()))
+-{}
 +            0U,
-+
-+
-+
+ 
+-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;
+-}
 +      0U,
-+
-+
+ 
+-IR::PrimaryKeyDef_var::operator const ::IR::PrimaryKeyDef_ptr &() const // cast
+-{
+-  return this->ptr_;
+-}
+ 
+-IR::PrimaryKeyDef_var::operator ::IR::PrimaryKeyDef_ptr &() // cast 
+-{
+-  return this->ptr_;
+-}
 +  13,
-+  ACE_NTOHL (0x656d6974), 
-+  ACE_NTOHL (0x735f6576), 
-+  ACE_NTOHL (0x656e7473), 
++  ACE_NTOHL (0x656d6974),
++  ACE_NTOHL (0x735f6576),
++  ACE_NTOHL (0x656e7473),
 +  ACE_NTOHL (0x0),  // name = emits_events
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  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 (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 (0x456d6974),
++    ACE_NTOHL (0x73446566),
 +    ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
 +    CORBA::tk_sequence, // typecode kind
 +    68, // encapsulation length
@@ -895,44 +7419,54 @@
 +      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 (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 (0x456d6974),
++        ACE_NTOHL (0x73446566),
 +        ACE_NTOHL (0x0),  // name = EmitsDef
-+
+ 
+-::IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::operator-> (void) const
+-{
+-  return this->ptr_;
+-}
 +      0U,
-+
+ 
+-::IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::in (void) const
+-{
+-  return this->ptr_;
+-}
 +
 +  17,
-+  ACE_NTOHL (0x7075626c), 
-+  ACE_NTOHL (0x69736865), 
-+  ACE_NTOHL (0x735f6576), 
-+  ACE_NTOHL (0x656e7473), 
++  ACE_NTOHL (0x7075626c),
++  ACE_NTOHL (0x69736865),
++  ACE_NTOHL (0x735f6576),
++  ACE_NTOHL (0x656e7473),
 +  ACE_NTOHL (0x0),  // name = publishes_events
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  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 (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 (0x5075626c),
++    ACE_NTOHL (0x69736865),
++    ACE_NTOHL (0x73446566),
 +    ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
 +    CORBA::tk_sequence, // typecode kind
 +    76, // encapsulation length
@@ -941,227 +7475,3430 @@
 +      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 (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 (0x5075626c),
++        ACE_NTOHL (0x69736865),
++        ACE_NTOHL (0x73446566),
 +        ACE_NTOHL (0x0),  // name = PublishesDef
 +
 +      0U,
 +
 +
 +  16,
-+  ACE_NTOHL (0x636f6e73), 
-+  ACE_NTOHL (0x756d6573), 
-+  ACE_NTOHL (0x5f657665), 
++  ACE_NTOHL (0x636f6e73),
++  ACE_NTOHL (0x756d6573),
++  ACE_NTOHL (0x5f657665),
 +  ACE_NTOHL (0x6e747300),  // name = consumes_events
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  144, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     34,
-     ACE_NTOHL (0x49444c3a), 
-@@ -14723,8 +15095,8 @@
- {
-   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
-@@ -14963,22 +15335,21 @@
-   ACE_NTOHL (0x6172795f), 
-   ACE_NTOHL (0x6b657900),  // name = primary_key
-   CORBA::tk_objref, // typecode kind
--  60, // encapsulation length
-+  56, // 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 (0x412f5661), 
-     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
-+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-+    9,
-+    ACE_NTOHL (0x56616c75), 
-+    ACE_NTOHL (0x65446566), 
-+    ACE_NTOHL (0x0),  // name = ValueDef
++    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
++    CORBA::tk_sequence, // typecode kind
++    72, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_objref, // typecode kind
++      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
++
++      0U,
++
++
++  9,
++  ACE_NTOHL (0x69735f62),
++  ACE_NTOHL (0x61736963),
++  ACE_NTOHL (0x0),  // name = is_basic
++  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)
++  );
++
++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 *_tao_void_pointer)
++{
++  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*, _tao_void_pointer);
++  delete tmp;
++}
++
++IR::PrimaryKeyDef_ptr
++tao_IR_PrimaryKeyDef_duplicate (
++    IR::PrimaryKeyDef_ptr p
++  )
++{
++  return IR::PrimaryKeyDef::_duplicate (p);
++}
++
++void
++tao_IR_PrimaryKeyDef_release (
++    IR::PrimaryKeyDef_ptr p
++  )
++{
++  CORBA::release (p);
++}
++
++IR::PrimaryKeyDef_ptr
++tao_IR_PrimaryKeyDef_nil (
++    void
++  )
++{
++  return IR::PrimaryKeyDef::_nil ();
++}
++
++IR::PrimaryKeyDef_ptr
++tao_IR_PrimaryKeyDef_narrow (
++    CORBA::Object *p
++    ACE_ENV_ARG_DECL
++  )
++{
++  return IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
++}
++
++CORBA::Object *
++tao_IR_PrimaryKeyDef_upcast (
++    void *src
++  )
++{
++  IR::PrimaryKeyDef **tmp =
++    ACE_static_cast (IR::PrimaryKeyDef **, src);
++  return *tmp;
++}
++
++int IR::PrimaryKeyDef::_tao_class_id = 0;
++
++// *************************************************************
++// 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)
+@@ -14105,9 +14392,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::PrimaryKeyDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::PrimaryKeyDef_out
+ // *************************************************************
+ 
+ IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_ptr &p)
+@@ -14173,16 +14458,23 @@
+   TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      const char * primary_key_id ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const char * primary_key_id
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
  
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::Boolean result);
+@@ -14198,7 +14490,8 @@
+ 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 ACE_ENV_ARG_DECL_NOT_USED    
++    const char * primary_key_id
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     primary_key_id_ (primary_key_id)
+@@ -14237,6 +14530,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -14265,30 +14559,38 @@
+ public:
+   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     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;
  };
  
-@@ -15402,9 +15773,9 @@
- {
-   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
-@@ -15900,9 +16271,9 @@
- {
-   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
-@@ -18881,11 +19252,11 @@
- {
-   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
-@@ -19069,17 +19440,43 @@
-     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -14303,7 +14605,6 @@
    ACE_CHECK_RETURN (0);
    
--  return proxy.is_basic (
-+  return proxy.is_basic (
-+      this,
-+      ACE_TRY_ENV
-+    );
-+}
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -14318,6 +14619,7 @@
+   return exception_list;
+ }
+ 
 +
-+IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
-+    const char * id,
-+    const char * name,
-+    const char * version,
-+    CORBA_ValueDef_ptr primary_key,
-+    CORBA::Environment &ACE_TRY_ENV
-+  )
-+  ACE_THROW_SPEC ((
-+    CORBA::SystemException
-+  ))
-+{
-+  _TAO_HomeDef_Proxy_Impl &proxy = 
-+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-+  ACE_CHECK_RETURN (0);
-+  
-+  return proxy.create_primary_key (
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -14335,7 +14637,7 @@
+ }
+ 
+ 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;
+@@ -14397,10 +14699,11 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a _tao_ri (
++      TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
+         &_tao_call,
+         _collocated_tao_target_,
+-        primary_key_id ACE_ENV_ARG_PARAMETER
++        primary_key_id
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -14408,14 +14711,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -14461,9 +14764,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -14486,11 +14789,11 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           CORBA::Boolean _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -14498,15 +14801,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -14517,7 +14820,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -14531,7 +14834,7 @@
+ 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_
+     ACE_ENV_ARG_DECL
+   )
+@@ -14540,13 +14843,13 @@
+   ))
+ {
+   
+-  CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -14573,24 +14876,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get _tao_ri (
++      TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -14604,17 +14908,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -14627,9 +14931,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -14640,7 +14944,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -14651,13 +14955,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -14665,15 +14969,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -14681,11 +14985,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -14695,7 +14999,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -14751,14 +15055,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::PrimaryKeyDef::PrimaryKeyDef (int collocated)
+ {
+   this->IR_PrimaryKeyDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::PrimaryKeyDef::~PrimaryKeyDef (void)
+ {}
+ 
+@@ -14798,8 +15101,7 @@
+   return PrimaryKeyDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::PrimaryKeyDef_ptr 
+-IR::PrimaryKeyDef::_unchecked_narrow (
++IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -14816,8 +15118,7 @@
+       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 () &&IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -14825,25 +15126,12 @@
+               ::IR::PrimaryKeyDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              PrimaryKeyDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::PrimaryKeyDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              PrimaryKeyDef::_nil ()
+-            );
++          PrimaryKeyDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::PrimaryKeyDef (stub, 0, obj->_servant ()), PrimaryKeyDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -14891,25 +15179,25 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::Contained::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -14941,12 +15229,12 @@
+   
+   return proxy.is_a (
        this,
-+      id,
-+      name,
-+      version,
-+      primary_key,
-       ACE_TRY_ENV
+-      primary_key_id ACE_ENV_ARG_PARAMETER
++      primary_key_id
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
--IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
-+IR::FactoryDef_ptr IR::HomeDef::create_factory (
+-::CORBA::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
+-    
++CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -14958,7 +15246,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.primary_key (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+@@ -14992,7 +15281,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDef, &_tc_TAO_tc_IR_PrimaryKeyDef)
+ TAO_NAMESPACE_END
+ 
+ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
+@@ -15066,8 +15355,26 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    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
++    CORBA::tk_string,
++    0U, // string length
++
+   8,
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
+@@ -15123,7 +15430,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDescription, &_tc_TAO_tc_IR_PrimaryKeyDescription)
+ TAO_NAMESPACE_END
+ 
+ void IR::PrimaryKeyDescription::_tao_any_destructor (void *_tao_void_pointer)
+@@ -15132,12 +15439,6 @@
+   delete tmp;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::FactoryDef::_tao_class_id = 0;
+-
+ IR::FactoryDef_ptr
+ tao_IR_FactoryDef_duplicate (
+     IR::FactoryDef_ptr p
+@@ -15181,10 +15482,10 @@
+   return *tmp;
+ }
+ 
++int IR::FactoryDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::FactoryDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::FactoryDef_var
+ // *************************************************************
+ 
+ IR::FactoryDef_var::FactoryDef_var (void) // default constructor
+@@ -15307,9 +15608,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::FactoryDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::FactoryDef_out
+ // *************************************************************
+ 
+ IR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
+@@ -15436,14 +15735,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::FactoryDef::FactoryDef (int collocated)
+ {
+   this->IR_FactoryDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::FactoryDef::~FactoryDef (void)
+ {}
+ 
+@@ -15483,8 +15781,7 @@
+   return FactoryDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::FactoryDef_ptr 
+-IR::FactoryDef::_unchecked_narrow (
++IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -15501,8 +15798,7 @@
+       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 () &&IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -15510,25 +15806,12 @@
+               ::IR::FactoryDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              FactoryDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::FactoryDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              FactoryDef::_nil ()
+-            );
++          FactoryDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::FactoryDef (stub, 0, obj->_servant ()), FactoryDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -15577,37 +15860,37 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::OperationDef::_tao_class_id))
++      &CORBA_OperationDef::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -15653,15 +15936,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::FinderDef::_tao_class_id = 0;
+-
+ IR::FinderDef_ptr
+ tao_IR_FinderDef_duplicate (
+     IR::FinderDef_ptr p
+@@ -15705,10 +15982,10 @@
+   return *tmp;
+ }
+ 
++int IR::FinderDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::FinderDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::FinderDef_var
+ // *************************************************************
+ 
+ IR::FinderDef_var::FinderDef_var (void) // default constructor
+@@ -15831,9 +16108,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::FinderDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::FinderDef_out
+ // *************************************************************
+ 
+ IR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
+@@ -15960,14 +16235,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::FinderDef::FinderDef (int collocated)
+ {
+   this->IR_FinderDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::FinderDef::~FinderDef (void)
+ {}
+ 
+@@ -16007,8 +16281,7 @@
+   return FinderDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::FinderDef_ptr 
+-IR::FinderDef::_unchecked_narrow (
++IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -16025,8 +16298,7 @@
+       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 () &&IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -16034,25 +16306,12 @@
+               ::IR::FinderDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              FinderDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::FinderDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              FinderDef::_nil ()
+-            );
++          FinderDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::FinderDef (stub, 0, obj->_servant ()), FinderDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -16101,37 +16360,37 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::OperationDef::_tao_class_id))
++      &CORBA_OperationDef::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -16177,15 +16436,9 @@
+ 
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
+ TAO_NAMESPACE_END
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:67
+-
+-int IR::HomeDef::_tao_class_id = 0;
+-
+ IR::HomeDef_ptr
+ tao_IR_HomeDef_duplicate (
+     IR::HomeDef_ptr p
+@@ -16229,10 +16482,10 @@
+   return *tmp;
+ }
+ 
++int IR::HomeDef::_tao_class_id = 0;
++
+ // *************************************************************
+-// IR::HomeDef_var
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:654
++// Operations for class IR::HomeDef_var
+ // *************************************************************
+ 
+ IR::HomeDef_var::HomeDef_var (void) // default constructor
+@@ -16355,9 +16608,7 @@
+ }
+ 
+ // *************************************************************
+-// IR::HomeDef_out
+-// TAO_IDL - Generated from
+-// be/be_interface.cpp:932
++// Operations for class IR::HomeDef_out
+ // *************************************************************
+ 
+ IR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
+@@ -16422,16 +16673,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::HomeDef_ptr result);
+@@ -16445,7 +16703,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16460,7 +16719,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16475,6 +16733,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16492,7 +16751,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (::IR::HomeDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -16503,16 +16762,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::ComponentDef_ptr result);
+@@ -16526,7 +16792,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16541,7 +16808,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16556,6 +16822,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16573,7 +16840,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (::IR::ComponentDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -16584,16 +16851,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::PrimaryKeyDef_ptr result);
+@@ -16607,7 +16881,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16622,7 +16897,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16637,6 +16911,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16654,7 +16929,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (::IR::PrimaryKeyDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -16665,16 +16940,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::FactoryDefSeq * result);
+@@ -16688,7 +16970,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16703,7 +16986,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16718,6 +17000,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16735,7 +17018,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (::IR::FactoryDefSeq * result)
++TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -16746,16 +17029,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::FinderDefSeq * result);
+@@ -16769,7 +17059,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16784,7 +17075,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16799,6 +17089,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16816,7 +17107,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (::IR::FinderDefSeq * result)
++TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -16827,16 +17118,23 @@
+ public:
+   TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+       TAO_GIOP_Invocation *_tao_invocation,
+-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA::Object_ptr _tao_target
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (CORBA::Boolean result);
+@@ -16850,7 +17148,8 @@
+ 
+ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+     TAO_GIOP_Invocation *_tao_invocation,
+-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA::Object_ptr _tao_target
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+ {}
+@@ -16865,7 +17164,6 @@
+   ACE_CHECK_RETURN (0);
+   
+   return parameter_list;
+-
+ }
+ 
+ Dynamic::ExceptionList *
+@@ -16880,6 +17178,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -16912,16 +17211,23 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      CORBA_ValueDef_ptr primary_key
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::PrimaryKeyDef_ptr result);
+@@ -16933,7 +17239,7 @@
+   const char * id_;
+   const char * name_;
+   const char * version_;
+-  CORBA::ValueDef_ptr primary_key_;
++  CORBA_ValueDef_ptr primary_key_;
+   IR::PrimaryKeyDef_ptr _result;
+ };
+ 
+@@ -16943,7 +17249,8 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_NOT_USED    
++    CORBA_ValueDef_ptr primary_key
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -16994,6 +17301,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -17011,7 +17319,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (::IR::PrimaryKeyDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -17026,17 +17334,24 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::ParDescriptionSeq & params,
+-      const CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_ParDescriptionSeq & params,
++      const CORBA_ExceptionDefSeq & exceptions
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::FactoryDef_ptr result);
+@@ -17048,8 +17363,8 @@
+   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;
+ };
+ 
+@@ -17059,8 +17374,9 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::ParDescriptionSeq & params,
+-    const CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_ParDescriptionSeq & params,
++    const CORBA_ExceptionDefSeq & exceptions
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -17115,6 +17431,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -17132,7 +17449,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (::IR::FactoryDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -17147,17 +17464,24 @@
+       const char * id,
+       const char * name,
+       const char * version,
+-      const CORBA::ParDescriptionSeq & params,
+-      const CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS
+-    );
++      const CORBA_ParDescriptionSeq & params,
++      const CORBA_ExceptionDefSeq & exceptions
++      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
++
++
++  virtual Dynamic::ParameterList * arguments (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ 
+-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
++  virtual Dynamic::ExceptionList * exceptions (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+   
+-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
++  virtual CORBA::Any * result (
++      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
++
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+   void result (IR::FinderDef_ptr result);
+@@ -17169,8 +17493,8 @@
+   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;
+ };
+ 
+@@ -17180,8 +17504,9 @@
+     const char * id,
+     const char * name,
+     const char * version,
+-    const CORBA::ParDescriptionSeq & params,
+-    const CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_NOT_USED    
++    const CORBA_ParDescriptionSeq & params,
++    const CORBA_ExceptionDefSeq & exceptions
++    ACE_ENV_ARG_DECL_NOT_USED
+   )
+   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+     id_ (id),
+@@ -17236,6 +17561,7 @@
+   return exception_list;
+ }
+ 
++
+ CORBA::Any * 
+ TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -17253,7 +17579,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (::IR::FinderDef_ptr result)
++TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
+ {
+   // update the result 
+   this->_result = result;
+@@ -17273,7 +17599,7 @@
+ 
+ // Remote Implementation of the IDL interface methods
+ 
+-::IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
++IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -17282,13 +17608,13 @@
+   ))
+ {
+   
+-  IR::HomeDef_var _tao_retval (IR::HomeDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -17315,24 +17641,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_base_home_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17346,17 +17673,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -17369,9 +17696,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -17382,7 +17709,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -17393,13 +17720,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17407,15 +17734,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -17423,11 +17750,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -17437,10 +17764,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
++IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -17449,13 +17776,13 @@
+   ))
+ {
+   
+-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
+-
++  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 (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -17482,24 +17809,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_managed_component_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17513,17 +17841,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -17536,9 +17864,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -17549,7 +17877,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -17560,13 +17888,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17574,15 +17902,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -17590,11 +17918,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -17604,10 +17932,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
++IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -17616,13 +17944,13 @@
+   ))
+ {
+   
+-  IR::PrimaryKeyDef_var _tao_retval (IR::PrimaryKeyDef::_nil ());
+-
++  IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
++  IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -17649,24 +17977,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_primary_key_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17680,17 +18009,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -17703,9 +18032,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -17716,7 +18045,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -17727,13 +18056,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17741,15 +18070,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -17757,11 +18086,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -17771,10 +18100,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
++IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -17783,19 +18112,16 @@
+   ))
+ {
+   
+-  IR::FactoryDefSeq_var _tao_retval;
++  IR::FactoryDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::FactoryDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::FactoryDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -17820,24 +18146,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_factories_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17851,17 +18178,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -17874,9 +18201,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -17887,7 +18214,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -17898,13 +18225,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -17912,15 +18239,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -17928,11 +18255,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -17942,10 +18269,10 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
++IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
+     CORBA_Object *_collocated_tao_target_
+     ACE_ENV_ARG_DECL
+   )
+@@ -17954,19 +18281,16 @@
+   ))
+ {
+   
+-  IR::FinderDefSeq_var _tao_retval;
++  IR::FinderDefSeq *_tao_retval = 0;
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+-  {
+-    IR::FinderDefSeq *tmp;
+-    ACE_NEW_RETURN (tmp, IR::FinderDefSeq, _tao_retval._retn ());
+-    _tao_retval = tmp;
+-  }
++  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",
+@@ -17991,24 +18315,25 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_finders_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18022,17 +18347,17 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -18045,9 +18370,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -18058,7 +18383,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -18069,13 +18394,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18083,15 +18408,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -18099,11 +18424,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -18113,7 +18438,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
+@@ -18157,9 +18482,10 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_is_basic_get _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
+         &_tao_call,
+-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
++        _collocated_tao_target_
++        ACE_ENV_ARG_PARAMETER
+       );
+             ACE_CHECK_RETURN (_tao_retval);
+ 
+@@ -18167,14 +18493,14 @@
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18211,9 +18537,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -18236,11 +18562,11 @@
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+           CORBA::Boolean _tao_retval_info = _tao_retval;
+-          _tao_ri.result (_tao_retval_info);
++          ri.result (_tao_retval_info);
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18248,15 +18574,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -18267,7 +18593,7 @@
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_CHECK_RETURN (_tao_retval);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+@@ -18281,12 +18607,12 @@
+ return _tao_retval;
+ }
+ 
+-::IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
++IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
+     CORBA_Object *_collocated_tao_target_,
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA::ValueDef_ptr primary_key
++    CORBA_ValueDef_ptr primary_key
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -18294,20 +18620,20 @@
+   ))
+ {
+   
+-  IR::PrimaryKeyDef_var _tao_retval (IR::PrimaryKeyDef::_nil ());
+-
++  IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
++  IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_primary_key",
+       18,
+-      4,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -18327,28 +18653,29 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_create_primary_key _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+-        primary_key ACE_ENV_ARG_PARAMETER
++        primary_key
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18362,13 +18689,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -18384,7 +18711,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -18397,9 +18724,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -18410,7 +18737,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -18421,13 +18748,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18435,15 +18762,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -18451,11 +18778,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -18465,16 +18792,16 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
++IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
+     CORBA_Object *_collocated_tao_target_,
      const char * id,
      const char * name,
      const char * version,
--    CORBA_ValueDef_ptr primary_key,
+-    const CORBA::ParDescriptionSeq & params,
+-    const CORBA::ExceptionDefSeq & exceptions
 +    const CORBA_ParDescriptionSeq & params,
-+    const CORBA_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
++    const CORBA_ExceptionDefSeq & exceptions
+     ACE_ENV_ARG_DECL
    )
    ACE_THROW_SPEC ((
-@@ -19090,17 +19487,18 @@
-     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+@@ -18482,20 +18809,20 @@
+   ))
+ {
+   
+-  IR::FactoryDef_var _tao_retval (IR::FactoryDef::_nil ());
+-
++  IR::FactoryDef_ptr _tao_retval = IR::FactoryDef::_nil ();
++  IR::FactoryDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_factory",
+       14,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -18515,29 +18842,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_create_factory _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         params,
+-        exceptions ACE_ENV_ARG_PARAMETER
++        exceptions
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18551,13 +18879,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -18574,7 +18902,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -18587,9 +18915,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -18600,7 +18928,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -18611,13 +18939,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18625,15 +18953,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -18641,11 +18969,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -18655,16 +18983,16 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+-::IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
++IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
+     CORBA_Object *_collocated_tao_target_,
+     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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -18672,20 +19000,20 @@
+   ))
+ {
+   
+-  IR::FinderDef_var _tao_retval (IR::FinderDef::_nil ());
+-
++  IR::FinderDef_ptr _tao_retval = IR::FinderDef::_nil ();
++  IR::FinderDef_var _tao_safe_retval (_tao_retval);
+ 
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+   if (istub == 0)
+-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
++    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ 
+   
+   TAO_GIOP_Twoway_Invocation _tao_call (
+       istub,
+       "create_finder",
+       13,
+-      5,
++      1,
+       istub->orb_core ()
+     );
+   
+@@ -18705,29 +19033,30 @@
+       _invoke_status = TAO_INVOKE_EXCEPTION;
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+-      TAO_ClientRequestInfo_IR_HomeDef_create_finder _tao_ri (
++      TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
+         &_tao_call,
+         _collocated_tao_target_,
+         id,
+         name,
+         version,
+         params,
+-        exceptions ACE_ENV_ARG_PARAMETER
++        exceptions
++        ACE_ENV_ARG_PARAMETER
+       );
+-            ACE_CHECK_RETURN (_tao_retval._retn ());
++      ACE_CHECK_RETURN (0);
+ 
+ #endif /* TAO_HAS_INTERCEPTORS */
+       
+       
+       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
++      TAO_INTERCEPTOR (ri.response_expected (1));
+       
+ #if TAO_HAS_INTERCEPTORS == 1
+       
+       ACE_TRY
+         {
+           _tao_vfr.send_request (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18741,13 +19070,13 @@
+ #endif /* TAO_HAS_INTERCEPTORS */
+           
+           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           _tao_call.prepare_header (
+               ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               ACE_ENV_ARG_PARAMETER
+             );
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+           if (!(
+@@ -18764,7 +19093,7 @@
+             
+           _invoke_status =
+             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
++          TAO_INTERCEPTOR_CHECK_RETURN (0);
+ 
+           if (_invoke_status == TAO_INVOKE_EXCEPTION)
+             {
+@@ -18777,9 +19106,9 @@
+           else if (_invoke_status == TAO_INVOKE_RESTART)
+             {
+               TAO_INTERCEPTOR (
+-                _tao_ri.reply_status (_invoke_status);
++                ri.reply_status (_invoke_status);
+                 _tao_vfr.receive_other (
+-                  &_tao_ri
++                  &ri
+                   ACE_ENV_ARG_PARAMETER
+                 );
+                 ACE_TRY_CHECK;
+@@ -18790,7 +19119,7 @@
+           
+           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+           if (!(
+-                            (_tao_in >> _tao_retval.inout ())
++                            (_tao_in >> _tao_safe_retval.inout ())
+               ))
+             {
+               TAO_INTERCEPTOR_THROW_RETURN (
+@@ -18801,13 +19130,13 @@
+             }
+           
+ #if TAO_HAS_INTERCEPTORS == 1
+-          ::IR::FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
+-          _tao_ri.result (_tao_retval_info);
+-          _tao_retval = _tao_retval_info;
++          IR::FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
++          ri.result (_tao_retval_info);
++          _tao_safe_retval = _tao_retval_info;
+           
+-          _tao_ri.reply_status (_invoke_status);
++          ri.reply_status (_invoke_status);
+           _tao_vfr.receive_reply (
+-            &_tao_ri
++            &ri
+             ACE_ENV_ARG_PARAMETER
+           );
+           ACE_TRY_CHECK;
+@@ -18815,15 +19144,15 @@
+       }
+     ACE_CATCHANY
+       {
+-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
++        ri.exception (&ACE_ANY_EXCEPTION);
+         _tao_vfr.receive_exception (
+-          &_tao_ri
++          &ri
+           ACE_ENV_ARG_PARAMETER
+         );
+         ACE_TRY_CHECK;
+         
+         PortableInterceptor::ReplyStatus _tao_status =
+-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+         ACE_TRY_CHECK;
+         
+         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+@@ -18831,11 +19160,11 @@
+           ACE_RE_THROW;
+       }
+     ACE_ENDTRY;
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++    ACE_CHECK_RETURN (0);
+ 
+     PortableInterceptor::ReplyStatus _tao_status =
+-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+-        ACE_CHECK_RETURN (_tao_retval._retn ());
++      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
++    ACE_CHECK_RETURN (0);
+ 
+     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+@@ -18845,7 +19174,7 @@
+     
+     break;
+   }
+-return _tao_retval._retn ();
++return _tao_safe_retval._retn ();
+ }
+ 
+ 
+@@ -18901,14 +19230,13 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ 
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/interface_cs.cpp:198
+-
++// default constructor
+ IR::HomeDef::HomeDef (int collocated)
+ {
+   this->IR_HomeDef_setup_collocation (collocated);
+ }
+ 
++// destructor
+ IR::HomeDef::~HomeDef (void)
+ {}
+ 
+@@ -18948,8 +19276,7 @@
+   return HomeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+ }
+ 
+-IR::HomeDef_ptr 
+-IR::HomeDef::_unchecked_narrow (
++IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
+     CORBA::Object_ptr obj
+     ACE_ENV_ARG_DECL_NOT_USED
+   )
+@@ -18966,8 +19293,7 @@
+       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 () &&IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
+         )
+         {
+           ACE_NEW_RETURN (
+@@ -18975,25 +19301,12 @@
+               ::IR::HomeDef (
+                   stub,
+                   1,
+-                  obj->_servant ()
+-                ),
+-              HomeDef::_nil ()
+-            );
+-        }
++            obj->_servant ()),
+       
+-      if (CORBA::is_nil (default_proxy))
+-        {
+-          ACE_NEW_RETURN (
+-              default_proxy,
+-              ::IR::HomeDef (
+-                  stub,
+-                  0,
+-                  obj->_servant ()
+-                ),
+-              HomeDef::_nil ()
+-            );
++          HomeDef::_nil ());
+         }
+-      
++      if (CORBA::is_nil (default_proxy))
++        ACE_NEW_RETURN (default_proxy, ::IR::HomeDef (stub, 0, obj->_servant ()), HomeDef::_nil ());
+       return default_proxy;
+     }
+   else 
+@@ -19044,61 +19357,61 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &::CORBA::InterfaceDef::_tao_class_id))
++      &CORBA_InterfaceDef::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Container::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_Contained::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IDLType::_tao_class_id))
+     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::_tao_class_id))
++      &CORBA_IRObject::_tao_class_id))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA::IRObject_ptr,
++            CORBA_IRObject_ptr,
+             this
+           )
+       );
+@@ -19116,8 +19429,7 @@
+   return "IDL:omg.org/IR/HomeDef:1.0";
+ }
+ 
+-::IR::HomeDef_ptr IR::HomeDef::base_home (
+-    
++IR::HomeDef_ptr IR::HomeDef::base_home (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19129,12 +19441,12 @@
    ACE_CHECK_RETURN (0);
    
--  return proxy.create_primary_key (
-+  return proxy.create_factory (
-       this,
+   return proxy.base_home (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::ComponentDef_ptr IR::HomeDef::managed_component (
+-    
++IR::ComponentDef_ptr IR::HomeDef::managed_component (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19146,12 +19458,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.managed_component (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
+-    
++IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19163,12 +19475,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.primary_key (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::FactoryDefSeq * IR::HomeDef::factories (
+-    
++IR::FactoryDefSeq * IR::HomeDef::factories (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19180,12 +19492,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.factories (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::FinderDefSeq * IR::HomeDef::finders (
+-    
++IR::FinderDefSeq * IR::HomeDef::finders (
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19197,12 +19509,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.finders (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+ CORBA::Boolean IR::HomeDef::is_basic (
+-    
+     ACE_ENV_SINGLE_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19214,15 +19526,16 @@
+   ACE_CHECK_RETURN (0);
+   
+   return proxy.is_basic (
+-      this ACE_ENV_ARG_PARAMETER
++      this
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::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,
+-    CORBA::ValueDef_ptr primary_key
++    CORBA_ValueDef_ptr primary_key
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19238,16 +19551,17 @@
        id,
        name,
        version,
--      primary_key,
-+      params,
-+      exceptions,
-       ACE_TRY_ENV
+-      primary_key ACE_ENV_ARG_PARAMETER
++      primary_key
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
--IR::FactoryDef_ptr IR::HomeDef::create_factory (
+-::IR::FactoryDef_ptr IR::HomeDef::create_factory (
++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
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19264,16 +19578,17 @@
+       name,
+       version,
+       params,
+-      exceptions ACE_ENV_ARG_PARAMETER
++      exceptions
++      ACE_ENV_ARG_PARAMETER
+     );
+ }
+ 
+-::IR::FinderDef_ptr IR::HomeDef::create_finder (
 +IR::FinderDef_ptr IR::HomeDef::create_finder (
      const char * id,
      const char * name,
      const char * version,
-@@ -19116,7 +19514,7 @@
-     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
-   
--  return proxy.create_factory (
-+  return proxy.create_finder (
-       this,
-       id,
+-    const CORBA::ParDescriptionSeq & params,
+-    const CORBA::ExceptionDefSeq & exceptions
++    const CORBA_ParDescriptionSeq & params,
++    const CORBA_ExceptionDefSeq & exceptions
+     ACE_ENV_ARG_DECL
+   )
+   ACE_THROW_SPEC ((
+@@ -19290,7 +19605,8 @@
        name,
-@@ -19127,96 +19525,372 @@
+       version,
+       params,
+-      exceptions ACE_ENV_ARG_PARAMETER
++      exceptions
++      ACE_ENV_ARG_PARAMETER
      );
  }
  
--IR::FinderDef_ptr IR::HomeDef::create_finder (
--    const char * id,
--    const char * name,
--    const char * version,
--    const CORBA_ParDescriptionSeq & params,
--    const CORBA_ExceptionDefSeq & exceptions,
--    CORBA::Environment &ACE_TRY_ENV
--  )
--  ACE_THROW_SPEC ((
--    CORBA::SystemException
--  ))
--{
--  _TAO_HomeDef_Proxy_Impl &proxy = 
--    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
--  ACE_CHECK_RETURN (0);
-+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), 
+@@ -19301,62 +19617,365 @@
+   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
+-};
++  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 (0x486f6d65),
 +  ACE_NTOHL (0x44656600),  // name = HomeDef
 +};
 +
@@ -1182,41 +10919,41 @@
 +{
 +  TAO_ENCAP_BYTE_ORDER, // byte order
 +  35,
-+  ACE_NTOHL (0x49444c3a), 
-+  ACE_NTOHL (0x6f6d672e), 
-+  ACE_NTOHL (0x6f72672f), 
-+  ACE_NTOHL (0x49522f48), 
-+  ACE_NTOHL (0x6f6d6544), 
-+  ACE_NTOHL (0x65736372), 
-+  ACE_NTOHL (0x69707469), 
-+  ACE_NTOHL (0x6f6e3a31), 
++  ACE_NTOHL (0x49444c3a),
++  ACE_NTOHL (0x6f6d672e),
++  ACE_NTOHL (0x6f72672f),
++  ACE_NTOHL (0x49522f48),
++  ACE_NTOHL (0x6f6d6544),
++  ACE_NTOHL (0x65736372),
++  ACE_NTOHL (0x69707469),
++  ACE_NTOHL (0x6f6e3a31),
 +  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDescription:1.0
 +  16,
-+  ACE_NTOHL (0x486f6d65), 
-+  ACE_NTOHL (0x44657363), 
-+  ACE_NTOHL (0x72697074), 
++  ACE_NTOHL (0x486f6d65),
++  ACE_NTOHL (0x44657363),
++  ACE_NTOHL (0x72697074),
 +  ACE_NTOHL (0x696f6e00),  // name = HomeDescription
 +  12, // member count
 +  5,
-+  ACE_NTOHL (0x6e616d65), 
++  ACE_NTOHL (0x6e616d65),
 +  ACE_NTOHL (0x0),  // name = name
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  64, // encapsulation length
 +    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 (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 (0x4964656e),
++    ACE_NTOHL (0x74696669),
 +    ACE_NTOHL (0x65720000),  // name = Identifier
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  3,
@@ -1225,163 +10962,163 @@
 +  68, // encapsulation length
 +    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 (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 (0x5265706f),
++    ACE_NTOHL (0x7369746f),
++    ACE_NTOHL (0x72794964),
 +    ACE_NTOHL (0x0),  // name = RepositoryId
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  11,
-+  ACE_NTOHL (0x64656669), 
-+  ACE_NTOHL (0x6e65645f), 
++  ACE_NTOHL (0x64656669),
++  ACE_NTOHL (0x6e65645f),
 +  ACE_NTOHL (0x696e0000),  // name = defined_in
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  68, // encapsulation length
 +    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 (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 (0x5265706f),
++    ACE_NTOHL (0x7369746f),
++    ACE_NTOHL (0x72794964),
 +    ACE_NTOHL (0x0),  // name = RepositoryId
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  8,
-+  ACE_NTOHL (0x76657273), 
++  ACE_NTOHL (0x76657273),
 +  ACE_NTOHL (0x696f6e00),  // name = version
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  64, // encapsulation length
 +    TAO_ENCAP_BYTE_ORDER, // byte order
 +    31,
-+    ACE_NTOHL (0x49444c3a), 
-+    ACE_NTOHL (0x6f6d672e), 
-+    ACE_NTOHL (0x6f72672f), 
-+    ACE_NTOHL (0x49522f56), 
-+    ACE_NTOHL (0x65727369), 
-+    ACE_NTOHL (0x6f6e5370), 
-+    ACE_NTOHL (0x65633a31), 
++    ACE_NTOHL (0x49444c3a),
++    ACE_NTOHL (0x6f6d672e),
++    ACE_NTOHL (0x6f72672f),
++    ACE_NTOHL (0x49522f56),
++    ACE_NTOHL (0x65727369),
++    ACE_NTOHL (0x6f6e5370),
++    ACE_NTOHL (0x65633a31),
 +    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
 +    12,
-+    ACE_NTOHL (0x56657273), 
-+    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x56657273),
++    ACE_NTOHL (0x696f6e53),
 +    ACE_NTOHL (0x70656300),  // name = VersionSpec
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  10,
-+  ACE_NTOHL (0x62617365), 
-+  ACE_NTOHL (0x5f686f6d), 
++  ACE_NTOHL (0x62617365),
++  ACE_NTOHL (0x5f686f6d),
 +  ACE_NTOHL (0x65000000),  // name = base_home
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  68, // encapsulation length
 +    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 (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 (0x5265706f),
++    ACE_NTOHL (0x7369746f),
++    ACE_NTOHL (0x72794964),
 +    ACE_NTOHL (0x0),  // name = RepositoryId
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  18,
-+  ACE_NTOHL (0x6d616e61), 
-+  ACE_NTOHL (0x6765645f), 
-+  ACE_NTOHL (0x636f6d70), 
-+  ACE_NTOHL (0x6f6e656e), 
++  ACE_NTOHL (0x6d616e61),
++  ACE_NTOHL (0x6765645f),
++  ACE_NTOHL (0x636f6d70),
++  ACE_NTOHL (0x6f6e656e),
 +  ACE_NTOHL (0x74000000),  // name = managed_component
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  68, // encapsulation length
 +    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 (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 (0x5265706f),
++    ACE_NTOHL (0x7369746f),
++    ACE_NTOHL (0x72794964),
 +    ACE_NTOHL (0x0),  // name = RepositoryId
-+    CORBA::tk_string, 
++    CORBA::tk_string,
 +    0U, // string length
 +
 +  16,
-+  ACE_NTOHL (0x7072696d), 
-+  ACE_NTOHL (0x6172795f), 
-+  ACE_NTOHL (0x6b65795f), 
++  ACE_NTOHL (0x7072696d),
++  ACE_NTOHL (0x6172795f),
++  ACE_NTOHL (0x6b65795f),
 +  ACE_NTOHL (0x64656600),  // name = primary_key_def
 +  CORBA::tk_objref, // typecode kind
 +  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 (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 (0x5072696d),
++    ACE_NTOHL (0x6172794b),
++    ACE_NTOHL (0x65794465),
 +    ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
 +
 +  10,
-+  ACE_NTOHL (0x66616374), 
-+  ACE_NTOHL (0x6f726965), 
++  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 (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 (0x46616374),
++    ACE_NTOHL (0x6f727944),
++    ACE_NTOHL (0x65665365),
 +    ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
 +    CORBA::tk_sequence, // typecode kind
 +    72, // encapsulation length
@@ -1390,62 +11127,41 @@
 +      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 (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 (0x46616374),
++        ACE_NTOHL (0x6f727944),
 +        ACE_NTOHL (0x65660000),  // name = FactoryDef
 +
 +      0U,
-   
--  return proxy.create_finder (
--      this,
--      id,
--      name,
--      version,
--      params,
--      exceptions,
--      ACE_TRY_ENV
--    );
--}
- 
--static const CORBA::Long _oc_IR_HomeDef[] =
--{
++
++
 +  8,
-+  ACE_NTOHL (0x66696e64), 
++  ACE_NTOHL (0x66696e64),
 +  ACE_NTOHL (0x65727300),  // name = finders
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  140, // encapsulation length
-   TAO_ENCAP_BYTE_ORDER, // byte order
--  27,
++  TAO_ENCAP_BYTE_ORDER, // byte order
 +    32,
-   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
--};
-+    ACE_NTOHL (0x49522f46), 
-+    ACE_NTOHL (0x696e6465), 
-+    ACE_NTOHL (0x72446566), 
-+    ACE_NTOHL (0x5365713a), 
++  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 (0x46696e64),
++    ACE_NTOHL (0x65724465),
++    ACE_NTOHL (0x66536571),
 +    ACE_NTOHL (0x0),  // name = FinderDefSeq
 +    CORBA::tk_sequence, // typecode kind
 +    72, // encapsulation length
@@ -1454,17 +11170,17 @@
 +      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 (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 (0x46696e64),
++        ACE_NTOHL (0x65724465),
 +        ACE_NTOHL (0x66000000),  // name = FinderDef
  
 -static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (
@@ -1478,14 +11194,14 @@
  
 -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_DEFINE (::CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
 -TAO_NAMESPACE_END
  
 -static const CORBA::Long _oc_IR_HomeDescription[] =
 -{
 +  11,
-+  ACE_NTOHL (0x6f706572), 
-+  ACE_NTOHL (0x6174696f), 
++  ACE_NTOHL (0x6f706572),
++  ACE_NTOHL (0x6174696f),
 +  ACE_NTOHL (0x6e730000),  // name = operations
 +  CORBA::tk_alias, // typecode kind for typedefs
 +  2036, // encapsulation length
@@ -1497,18 +11213,18 @@
    ACE_NTOHL (0x6f72672f), 
 -  ACE_NTOHL (0x49522f48), 
 -  ACE_NTOHL (0x6f6d6544), 
-+    ACE_NTOHL (0x434f5242), 
-+    ACE_NTOHL (0x412f4f70), 
-+    ACE_NTOHL (0x44657363), 
-+    ACE_NTOHL (0x72697074), 
-+    ACE_NTOHL (0x696f6e53), 
-+    ACE_NTOHL (0x65713a31), 
++    ACE_NTOHL (0x434f5242),
++    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
 +    17,
-+    ACE_NTOHL (0x4f704465), 
-+    ACE_NTOHL (0x73637269), 
-+    ACE_NTOHL (0x7074696f), 
-+    ACE_NTOHL (0x6e536571), 
++    ACE_NTOHL (0x4f704465),
++    ACE_NTOHL (0x73637269),
++    ACE_NTOHL (0x7074696f),
++    ACE_NTOHL (0x6e536571),
 +    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
 +    CORBA::tk_sequence, // typecode kind
 +    1956, // encapsulation length
@@ -1517,13 +11233,13 @@
 +      1940, // 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 (0x65726174), 
-+        ACE_NTOHL (0x696f6e44), 
++        ACE_NTOHL (0x49444c3a),
++        ACE_NTOHL (0x6f6d672e),
++        ACE_NTOHL (0x6f72672f),
++        ACE_NTOHL (0x434f5242),
++        ACE_NTOHL (0x412f4f70),
++        ACE_NTOHL (0x65726174),
++        ACE_NTOHL (0x696f6e44),
    ACE_NTOHL (0x65736372), 
    ACE_NTOHL (0x69707469), 
    ACE_NTOHL (0x6f6e3a31), 
@@ -1536,11 +11252,11 @@
 -  12, // member count
 +        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 (0x4f706572),
++        ACE_NTOHL (0x6174696f),
++        ACE_NTOHL (0x6e446573),
++        ACE_NTOHL (0x63726970),
++        ACE_NTOHL (0x74696f6e),
 +        ACE_NTOHL (0x0),  // name = OperationDescription
 +        9, // member count
    5,
@@ -1560,16 +11276,16 @@
 -    ACE_NTOHL (0x69666965), 
 -    ACE_NTOHL (0x723a312e), 
 -    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x412f4964), 
-+          ACE_NTOHL (0x656e7469), 
-+          ACE_NTOHL (0x66696572), 
-+          ACE_NTOHL (0x3a312e30), 
++          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), 
-@@ -19227,17 +19901,18 @@
+@@ -19367,17 +19986,43 @@
    3,
    ACE_NTOHL (0x69640000),  // name = id
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1586,131 +11302,124 @@
 -    ACE_NTOHL (0x69746f72), 
 -    ACE_NTOHL (0x7949643a), 
 -    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x412f5265), 
-+          ACE_NTOHL (0x706f7369), 
-+          ACE_NTOHL (0x746f7279), 
-+          ACE_NTOHL (0x49643a31), 
++          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), 
-@@ -19251,17 +19926,18 @@
-   ACE_NTOHL (0x6e65645f), 
-   ACE_NTOHL (0x696e0000),  // name = defined_in
-   CORBA::tk_alias, // typecode kind for typedefs
--  68, // encapsulation length
++    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
--    32,
++    TAO_ENCAP_BYTE_ORDER, // byte order
 +          35,
-     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
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x412f5265), 
-+          ACE_NTOHL (0x706f7369), 
-+          ACE_NTOHL (0x746f7279), 
-+          ACE_NTOHL (0x49643a31), 
++    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), 
-@@ -19274,17 +19950,18 @@
-   ACE_NTOHL (0x76657273), 
-   ACE_NTOHL (0x696f6e00),  // name = version
-   CORBA::tk_alias, // typecode kind for typedefs
--  64, // encapsulation length
-+        68, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
--    31,
-+          34,
-     ACE_NTOHL (0x49444c3a), 
-     ACE_NTOHL (0x6f6d672e), 
-     ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x49522f56), 
--    ACE_NTOHL (0x65727369), 
--    ACE_NTOHL (0x6f6e5370), 
--    ACE_NTOHL (0x65633a31), 
--    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-+          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), 
-@@ -19292,502 +19969,732 @@
+@@ -19386,210 +20031,321 @@
      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 (0x72657375),
 +        ACE_NTOHL (0x6c740000),  // name = result
 +        CORBA::tk_TypeCode,
 +
 +        5,
-+        ACE_NTOHL (0x6d6f6465), 
++        ACE_NTOHL (0x6d6f6465),
 +        ACE_NTOHL (0x0),  // name = mode
 +        CORBA::tk_enum, // typecode kind
 +        100, // 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 (0x65726174), 
-+          ACE_NTOHL (0x696f6e4d), 
-+          ACE_NTOHL (0x6f64653a), 
++          ACE_NTOHL (0x49444c3a),
++          ACE_NTOHL (0x6f6d672e),
++          ACE_NTOHL (0x6f72672f),
++          ACE_NTOHL (0x434f5242),
++          ACE_NTOHL (0x412f4f70),
++          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 (0x4f706572),
++          ACE_NTOHL (0x6174696f),
++          ACE_NTOHL (0x6e4d6f64),
 +          ACE_NTOHL (0x65000000),  // name = OperationMode
 +          2, // member count
-   10,
--  ACE_NTOHL (0x62617365), 
--  ACE_NTOHL (0x5f686f6d), 
--  ACE_NTOHL (0x65000000),  // name = base_home
-+          ACE_NTOHL (0x4f505f4e), 
-+          ACE_NTOHL (0x4f524d41), 
++  10,
++          ACE_NTOHL (0x4f505f4e),
++          ACE_NTOHL (0x4f524d41),
 +          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
 +          10,
-+          ACE_NTOHL (0x4f505f4f), 
-+          ACE_NTOHL (0x4e455741), 
++          ACE_NTOHL (0x4f505f4f),
++          ACE_NTOHL (0x4e455741),
 +          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
 +
 +        9,
-+        ACE_NTOHL (0x636f6e74), 
-+        ACE_NTOHL (0x65787473), 
++        ACE_NTOHL (0x636f6e74),
++        ACE_NTOHL (0x65787473),
 +        ACE_NTOHL (0x0),  // name = contexts
 +        CORBA::tk_alias, // typecode kind for typedefs
 +        236, // 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 (0x6e746578), 
-+          ACE_NTOHL (0x74496453), 
-+          ACE_NTOHL (0x65713a31), 
++          ACE_NTOHL (0x49444c3a),
++          ACE_NTOHL (0x6f6d672e),
++          ACE_NTOHL (0x6f72672f),
++          ACE_NTOHL (0x434f5242),
++          ACE_NTOHL (0x412f436f),
++          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 (0x436f6e74),
++          ACE_NTOHL (0x65787449),
++          ACE_NTOHL (0x64536571),
 +          ACE_NTOHL (0x0),  // name = ContextIdSeq
 +          CORBA::tk_sequence, // typecode kind
 +          164, // encapsulation length
@@ -1719,89 +11428,100 @@
 +            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 (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 (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
--    32,
++  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 (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
-+                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x412f4964), 
-+                ACE_NTOHL (0x656e7469), 
-+                ACE_NTOHL (0x66696572), 
-+                ACE_NTOHL (0x3a312e30), 
++    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 (0x4964656e),
++                ACE_NTOHL (0x74696669),
 +                ACE_NTOHL (0x65720000),  // name = Identifier
-     CORBA::tk_string, 
-     0U, // string length
- 
--  18,
--  ACE_NTOHL (0x6d616e61), 
--  ACE_NTOHL (0x6765645f), 
--  ACE_NTOHL (0x636f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x74000000),  // name = managed_component
++    CORBA::tk_string,
++    0U, // string length
++
 +
 +            0U,
 +
 +
-+        11,
-+        ACE_NTOHL (0x70617261), 
-+        ACE_NTOHL (0x6d657465), 
+   11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  0xffffffff, // indirection
+-  0xffffffa0, // negative offset (-96)
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
++        ACE_NTOHL (0x70617261),
++        ACE_NTOHL (0x6d657465),
 +        ACE_NTOHL (0x72730000),  // name = parameters
    CORBA::tk_alias, // typecode kind for typedefs
--  68, // encapsulation length
+-  64, // encapsulation length
 +        496, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
--    32,
+-    31,
 +          40,
      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
+-    ACE_NTOHL (0x49522f56), 
+-    ACE_NTOHL (0x65727369), 
+-    ACE_NTOHL (0x6f6e5370), 
+-    ACE_NTOHL (0x65633a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
+-    12,
+-    ACE_NTOHL (0x56657273), 
+-    ACE_NTOHL (0x696f6e53), 
+-    ACE_NTOHL (0x70656300),  // name = VersionSpec
 -    CORBA::tk_string, 
 -    0U, // string length
 -
+-  10,
+-  ACE_NTOHL (0x62617365), 
+-  ACE_NTOHL (0x5f686f6d), 
+-  ACE_NTOHL (0x65000000),  // name = base_home
+-  0xffffffff, // indirection
+-  0xffffff34, // negative offset (-204)
++          ACE_NTOHL (0x434f5242),
++          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
+   18,
+-  ACE_NTOHL (0x6d616e61), 
+-  ACE_NTOHL (0x6765645f), 
+-  ACE_NTOHL (0x636f6d70), 
+-  ACE_NTOHL (0x6f6e656e), 
+-  ACE_NTOHL (0x74000000),  // name = managed_component
+-  0xffffffff, // indirection
+-  0xffffff14, // negative offset (-236)
 -  16,
 -  ACE_NTOHL (0x7072696d), 
 -  ACE_NTOHL (0x6172795f), 
@@ -1809,18 +11529,10 @@
 -  ACE_NTOHL (0x64656600),  // name = primary_key_def
 -  CORBA::tk_objref, // typecode kind
 -  64, // encapsulation length
-+          ACE_NTOHL (0x434f5242), 
-+          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
-+          18,
-+          ACE_NTOHL (0x50617244), 
-+          ACE_NTOHL (0x65736372), 
-+          ACE_NTOHL (0x69707469), 
-+          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x50617244),
++          ACE_NTOHL (0x65736372),
++          ACE_NTOHL (0x69707469),
++          ACE_NTOHL (0x6f6e5365),
 +          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
 +          CORBA::tk_sequence, // typecode kind
 +          416, // encapsulation length
@@ -1849,24 +11561,24 @@
 -  ACE_NTOHL (0x66616374), 
 -  ACE_NTOHL (0x6f726965), 
 -  ACE_NTOHL (0x73000000),  // name = factories
-+              ACE_NTOHL (0x434f5242), 
-+              ACE_NTOHL (0x412f5061), 
-+              ACE_NTOHL (0x72616d65), 
-+              ACE_NTOHL (0x74657244), 
-+              ACE_NTOHL (0x65736372), 
-+              ACE_NTOHL (0x69707469), 
-+              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x434f5242),
++              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
 +              21,
-+              ACE_NTOHL (0x50617261), 
-+              ACE_NTOHL (0x6d657465), 
-+              ACE_NTOHL (0x72446573), 
-+              ACE_NTOHL (0x63726970), 
-+              ACE_NTOHL (0x74696f6e), 
++              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 (0x6e616d65),
 +              ACE_NTOHL (0x0),  // name = name
    CORBA::tk_alias, // typecode kind for typedefs
 -  144, // encapsulation length
@@ -1880,10 +11592,10 @@
 -    ACE_NTOHL (0x6163746f), 
 -    ACE_NTOHL (0x72794465), 
 -    ACE_NTOHL (0x66536571), 
-+                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x412f4964), 
-+                ACE_NTOHL (0x656e7469), 
-+                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x434f5242),
++                ACE_NTOHL (0x412f4964),
++                ACE_NTOHL (0x656e7469),
++                ACE_NTOHL (0x66696572),
      ACE_NTOHL (0x3a312e30), 
 -    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
 -    14,
@@ -1913,14 +11625,14 @@
 -        ACE_NTOHL (0x65660000),  // name = FactoryDef
 -
 -      0U,
-+                ACE_NTOHL (0x4964656e), 
-+                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x4964656e),
++                ACE_NTOHL (0x74696669),
 +                ACE_NTOHL (0x65720000),  // name = Identifier
-+                CORBA::tk_string, 
++                CORBA::tk_string,
 +                0U, // string length
  
 +              5,
-+              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x74797065),
 +              ACE_NTOHL (0x0),  // name = type
 +              CORBA::tk_TypeCode,
  
@@ -1930,8 +11642,8 @@
 -  CORBA::tk_alias, // typecode kind for typedefs
 -  140, // encapsulation length
 +              9,
-+              ACE_NTOHL (0x74797065), 
-+              ACE_NTOHL (0x5f646566), 
++              ACE_NTOHL (0x74797065),
++              ACE_NTOHL (0x5f646566),
 +              ACE_NTOHL (0x0),  // name = type_def
 +              CORBA::tk_objref, // typecode kind
 +              52, // encapsulation length
@@ -1956,17 +11668,17 @@
 -      TAO_ENCAP_BYTE_ORDER, // byte order
 -      CORBA::tk_objref, // typecode kind
 -      56, // encapsulation length
-+                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x412f4944), 
-+                ACE_NTOHL (0x4c547970), 
-+                ACE_NTOHL (0x653a312e), 
++                ACE_NTOHL (0x434f5242),
++                ACE_NTOHL (0x412f4944),
++                ACE_NTOHL (0x4c547970),
++                ACE_NTOHL (0x653a312e),
 +                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
 +                8,
-+                ACE_NTOHL (0x49444c54), 
++                ACE_NTOHL (0x49444c54),
 +                ACE_NTOHL (0x79706500),  // name = IDLType
 +
 +              5,
-+              ACE_NTOHL (0x6d6f6465), 
++              ACE_NTOHL (0x6d6f6465),
 +              ACE_NTOHL (0x0),  // name = mode
 +              CORBA::tk_enum, // typecode kind
 +              116, // encapsulation length
@@ -1981,32 +11693,32 @@
 -        ACE_NTOHL (0x72446566), 
 -        ACE_NTOHL (0x3a312e30), 
 -        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
-+                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x412f5061), 
-+                ACE_NTOHL (0x72616d65), 
-+                ACE_NTOHL (0x7465724d), 
-+                ACE_NTOHL (0x6f64653a), 
++                ACE_NTOHL (0x434f5242),
++                ACE_NTOHL (0x412f5061),
++                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 (0x50617261),
++                ACE_NTOHL (0x6d657465),
++                ACE_NTOHL (0x724d6f64),
 +                ACE_NTOHL (0x65000000),  // name = ParameterMode
 +                3, // member count
 +                9,
-+                ACE_NTOHL (0x50415241), 
-+                ACE_NTOHL (0x4d5f494e), 
++                ACE_NTOHL (0x50415241),
++                ACE_NTOHL (0x4d5f494e),
 +                ACE_NTOHL (0x0),  // name = PARAM_IN
          10,
 -        ACE_NTOHL (0x46696e64), 
 -        ACE_NTOHL (0x65724465), 
 -        ACE_NTOHL (0x66000000),  // name = FinderDef
-+                ACE_NTOHL (0x50415241), 
-+                ACE_NTOHL (0x4d5f4f55), 
++                ACE_NTOHL (0x50415241),
++                ACE_NTOHL (0x4d5f4f55),
 +                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
 +                12,
-+                ACE_NTOHL (0x50415241), 
-+                ACE_NTOHL (0x4d5f494e), 
++                ACE_NTOHL (0x50415241),
++                ACE_NTOHL (0x4d5f494e),
 +                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 +
  
@@ -2017,11 +11729,11 @@
 -  ACE_NTOHL (0x6f706572), 
 -  ACE_NTOHL (0x6174696f), 
 -  ACE_NTOHL (0x6e730000),  // name = operations
-+        ACE_NTOHL (0x65786365), 
-+        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x65786365),
++        ACE_NTOHL (0x7074696f),
 +        ACE_NTOHL (0x6e730000),  // name = exceptions
    CORBA::tk_alias, // typecode kind for typedefs
--  1296, // encapsulation length
+-  1548, // encapsulation length
 +        556, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
 -    39,
@@ -2030,37 +11742,36 @@
      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 (0x412f4578), 
-+          ACE_NTOHL (0x63446573), 
-+          ACE_NTOHL (0x63726970), 
-+          ACE_NTOHL (0x74696f6e), 
-+          ACE_NTOHL (0x5365713a), 
+-    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 (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
 +          18,
-+          ACE_NTOHL (0x45786344), 
-+          ACE_NTOHL (0x65736372), 
-+          ACE_NTOHL (0x69707469), 
-+          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x45786344),
++          ACE_NTOHL (0x65736372),
++          ACE_NTOHL (0x69707469),
++          ACE_NTOHL (0x6f6e5365),
 +          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
      CORBA::tk_sequence, // typecode kind
--    1212, // encapsulation length
+-    1468, // encapsulation length
 +          476, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
--      1196, // encapsulation length
+-      1452, // encapsulation length
 +            460, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
@@ -2068,109 +11779,84 @@
          ACE_NTOHL (0x6f6d672e), 
          ACE_NTOHL (0x6f72672f), 
          ACE_NTOHL (0x434f5242), 
--        ACE_NTOHL (0x415f4f70), 
+-        ACE_NTOHL (0x412f4f70), 
 -        ACE_NTOHL (0x65726174), 
-+              ACE_NTOHL (0x412f4578), 
-+              ACE_NTOHL (0x63657074), 
++              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_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
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
 +              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), 
+         21,
+-        ACE_NTOHL (0x4f706572), 
+-        ACE_NTOHL (0x6174696f), 
++              ACE_NTOHL (0x45786365),
++              ACE_NTOHL (0x7074696f),
+         ACE_NTOHL (0x6e446573), 
+         ACE_NTOHL (0x63726970), 
+         ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x0),  // name = OperationDescription
+-        9, // member count
 +              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
+@@ -19640,8 +20396,27 @@
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
+-        0xffffffff, // indirection
+-        0xffffff9c, // negative offset (-100)
 +              CORBA::tk_alias, // typecode kind for typedefs
 +              72, // encapsulation length
-+                TAO_ENCAP_BYTE_ORDER, // byte order
++          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 (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 (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_string, 
--        0U, // string length
--        8,
--        ACE_NTOHL (0x76657273), 
--        ACE_NTOHL (0x696f6e00),  // name = version
--        CORBA::tk_string, 
--        0U, // string length
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
+@@ -19665,218 +20440,208 @@
+           CORBA::tk_string, 
+           0U, // string length
+ 
 -        7,
 -        ACE_NTOHL (0x72657375), 
 -        ACE_NTOHL (0x6c740000),  // name = result
--        CORBA::tk_TypeCode,
--
++              5,
++              ACE_NTOHL (0x74797065),
++              ACE_NTOHL (0x0),  // name = type
+         CORBA::tk_TypeCode,
+ 
 -        5,
 -        ACE_NTOHL (0x6d6f6465), 
 -        ACE_NTOHL (0x0),  // name = mode
 -        CORBA::tk_enum, // typecode kind
 -        100, // encapsulation length
-+              CORBA::tk_alias, // typecode kind for typedefs
-+              72, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
+-          TAO_ENCAP_BYTE_ORDER, // byte order
 -          36,
-+                35,
-           ACE_NTOHL (0x49444c3a), 
-           ACE_NTOHL (0x6f6d672e), 
-           ACE_NTOHL (0x6f72672f), 
-           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x49444c3a), 
+-          ACE_NTOHL (0x6f6d672e), 
+-          ACE_NTOHL (0x6f72672f), 
+-          ACE_NTOHL (0x434f5242), 
 -          ACE_NTOHL (0x412f4f70), 
 -          ACE_NTOHL (0x65726174), 
 -          ACE_NTOHL (0x696f6e4d), 
@@ -2190,72 +11876,58 @@
 -          ACE_NTOHL (0x4f505f4f), 
 -          ACE_NTOHL (0x4e455741), 
 -          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-+                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
  
 -        9,
 -        ACE_NTOHL (0x636f6e74), 
 -        ACE_NTOHL (0x65787473), 
 -        ACE_NTOHL (0x0),  // name = contexts
-+              8,
-+              ACE_NTOHL (0x76657273), 
-+              ACE_NTOHL (0x696f6e00),  // name = version
-         CORBA::tk_alias, // typecode kind for typedefs
--        92, // encapsulation length
-+              68, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
+-        CORBA::tk_alias, // typecode kind for typedefs
+-        168, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
 -          35,
-+                34,
-           ACE_NTOHL (0x49444c3a), 
-           ACE_NTOHL (0x6f6d672e), 
-           ACE_NTOHL (0x6f72672f), 
-           ACE_NTOHL (0x434f5242), 
--          ACE_NTOHL (0x415f436f), 
--          ACE_NTOHL (0x6e746578), 
--          ACE_NTOHL (0x74496453), 
--          ACE_NTOHL (0x65713a31), 
--          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
--          19,
+-          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
+-          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
 -          CORBA::tk_sequence, // typecode kind
--          16, // encapsulation length
+-          96, // encapsulation length
 -            TAO_ENCAP_BYTE_ORDER, // byte order
-+                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
-+              CORBA::tk_TypeCode,
-+
-+
+-            CORBA::tk_alias, // typecode kind for typedefs
+-            80, // 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
+-              0xffffffff, // indirection
+-              0xfffffdac, // negative offset (-596)
 +            0U,
 +
 +
-+
+ 
              0U,
  
  
@@ -2263,11 +11935,11 @@
 -        ACE_NTOHL (0x70617261), 
 -        ACE_NTOHL (0x6d657465), 
 -        ACE_NTOHL (0x72730000),  // name = parameters
-+  ACE_NTOHL (0x61747472), 
-+  ACE_NTOHL (0x69627574), 
++  ACE_NTOHL (0x61747472),
++  ACE_NTOHL (0x69627574),
 +  ACE_NTOHL (0x65730000),  // name = attributes
          CORBA::tk_alias, // typecode kind for typedefs
--        444, // encapsulation length
+-        428, // encapsulation length
 +  1852, // encapsulation length
            TAO_ENCAP_BYTE_ORDER, // byte order
 -          40,
@@ -2276,38 +11948,37 @@
            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 (0x412f4174), 
-+    ACE_NTOHL (0x74724465), 
-+    ACE_NTOHL (0x73637269), 
-+    ACE_NTOHL (0x7074696f), 
-+    ACE_NTOHL (0x6e536571), 
-+    ACE_NTOHL (0x3a312e30), 
+-          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 (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
 +    19,
-+    ACE_NTOHL (0x41747472), 
-+    ACE_NTOHL (0x44657363), 
-+    ACE_NTOHL (0x72697074), 
-+    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x41747472),
++    ACE_NTOHL (0x44657363),
++    ACE_NTOHL (0x72697074),
++    ACE_NTOHL (0x696f6e53),
 +    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
            CORBA::tk_sequence, // typecode kind
--          360, // encapsulation length
+-          348, // encapsulation length
 +    1768, // encapsulation length
              TAO_ENCAP_BYTE_ORDER, // byte order
              CORBA::tk_struct, // typecode kind
--            344, // encapsulation length
+-            332, // encapsulation length
 +      1752, // encapsulation length
                TAO_ENCAP_BYTE_ORDER, // byte order
                43,
@@ -2315,67 +11986,65 @@
                ACE_NTOHL (0x6f6d672e), 
                ACE_NTOHL (0x6f72672f), 
                ACE_NTOHL (0x434f5242), 
--              ACE_NTOHL (0x415f5061), 
+-              ACE_NTOHL (0x412f5061), 
 -              ACE_NTOHL (0x72616d65), 
 -              ACE_NTOHL (0x74657244), 
-+        ACE_NTOHL (0x412f4174), 
-+        ACE_NTOHL (0x74726962), 
-+        ACE_NTOHL (0x75746544), 
++        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_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
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
 +        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), 
+               21,
+-              ACE_NTOHL (0x50617261), 
+-              ACE_NTOHL (0x6d657465), 
+-              ACE_NTOHL (0x72446573), 
++        ACE_NTOHL (0x41747472),
++        ACE_NTOHL (0x69627574),
++        ACE_NTOHL (0x65446573),
+               ACE_NTOHL (0x63726970), 
+               ACE_NTOHL (0x74696f6e), 
+-              ACE_NTOHL (0x0),  // name = ParameterDescription
+-              4, // member count
 +        ACE_NTOHL (0x0),  // name = AttributeDescription
 +        8, // member count
                5,
                ACE_NTOHL (0x6e616d65), 
                ACE_NTOHL (0x0),  // name = name
+-              0xffffffff, // indirection
+-              0xfffffccc, // negative offset (-820)
+-              5,
+-              ACE_NTOHL (0x74797065), 
+-              ACE_NTOHL (0x0),  // name = type
+-              CORBA::tk_TypeCode,
 +        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 (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 (0x4964656e),
++          ACE_NTOHL (0x74696669),
 +          ACE_NTOHL (0x65720000),  // name = Identifier
-               CORBA::tk_string, 
-               0U, // string length
--              5,
--              ACE_NTOHL (0x74797065), 
--              ACE_NTOHL (0x0),  // name = type
--              CORBA::tk_TypeCode,
++              CORBA::tk_string,
++              0U, // string length
  
 -              9,
 -              ACE_NTOHL (0x74797065), 
 -              ACE_NTOHL (0x5f646566), 
 -              ACE_NTOHL (0x0),  // name = type_def
 -              CORBA::tk_objref, // typecode kind
--              60, // encapsulation length
+-              52, // encapsulation length
 +        3,
 +        ACE_NTOHL (0x69640000),  // name = id
 +        CORBA::tk_alias, // typecode kind for typedefs
@@ -2387,65 +12056,86 @@
                  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 (0x412f5265), 
-+          ACE_NTOHL (0x706f7369), 
-+          ACE_NTOHL (0x746f7279), 
-+          ACE_NTOHL (0x49643a31), 
+-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++          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 (0x5265706f),
++          ACE_NTOHL (0x7369746f),
++          ACE_NTOHL (0x72794964),
 +          ACE_NTOHL (0x0),  // name = RepositoryId
-+          CORBA::tk_string, 
++          CORBA::tk_string,
 +          0U, // string length
 +
 +        11,
-+        ACE_NTOHL (0x64656669), 
-+        ACE_NTOHL (0x6e65645f), 
++        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 (0x415f4944), 
--                ACE_NTOHL (0x4c547970), 
--                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
-+          ACE_NTOHL (0x412f5265), 
-+          ACE_NTOHL (0x706f7369), 
-+          ACE_NTOHL (0x746f7279), 
-+          ACE_NTOHL (0x49643a31), 
++          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 (0x5265706f),
++          ACE_NTOHL (0x7369746f),
++          ACE_NTOHL (0x72794964),
 +          ACE_NTOHL (0x0),  // name = RepositoryId
-+          CORBA::tk_string, 
++          CORBA::tk_string,
 +          0U, // string length
- 
--              5,
--              ACE_NTOHL (0x6d6f6465), 
--              ACE_NTOHL (0x0),  // name = mode
--              CORBA::tk_enum, // typecode kind
--              116, // encapsulation length
-+        8,
-+        ACE_NTOHL (0x76657273), 
++
+                 8,
+-                ACE_NTOHL (0x49444c54), 
+-                ACE_NTOHL (0x79706500),  // name = IDLType
++        ACE_NTOHL (0x76657273),
 +        ACE_NTOHL (0x696f6e00),  // name = version
 +        CORBA::tk_alias, // typecode kind for typedefs
 +        68, // encapsulation length
-                 TAO_ENCAP_BYTE_ORDER, // byte order
--                36,
++                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
++        CORBA::tk_TypeCode,
+ 
+               5,
+               ACE_NTOHL (0x6d6f6465), 
+               ACE_NTOHL (0x0),  // name = mode
+               CORBA::tk_enum, // typecode kind
+-              116, // encapsulation length
++        104, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+                 36,
                  ACE_NTOHL (0x49444c3a), 
                  ACE_NTOHL (0x6f6d672e), 
                  ACE_NTOHL (0x6f72672f), 
@@ -2453,9 +12143,13 @@
 -                ACE_NTOHL (0x412f5061), 
 -                ACE_NTOHL (0x72616d65), 
 -                ACE_NTOHL (0x7465724d), 
--                ACE_NTOHL (0x6f64653a), 
++          ACE_NTOHL (0x412f4174),
++          ACE_NTOHL (0x74726962),
++          ACE_NTOHL (0x7574654d),
+                 ACE_NTOHL (0x6f64653a), 
 -                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
--                14,
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+                 14,
 -                ACE_NTOHL (0x50617261), 
 -                ACE_NTOHL (0x6d657465), 
 -                ACE_NTOHL (0x724d6f64), 
@@ -2469,233 +12163,161 @@
 -                ACE_NTOHL (0x50415241), 
 -                ACE_NTOHL (0x4d5f4f55), 
 -                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-+          ACE_NTOHL (0x412f5665), 
-+          ACE_NTOHL (0x7273696f), 
-+          ACE_NTOHL (0x6e537065), 
-+          ACE_NTOHL (0x633a312e), 
-+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          ACE_NTOHL (0x41747472),
++          ACE_NTOHL (0x69627574),
++          ACE_NTOHL (0x654d6f64),
++          ACE_NTOHL (0x65000000),  // name = AttributeMode
++          2, // member count
                  12,
 -                ACE_NTOHL (0x50415241), 
 -                ACE_NTOHL (0x4d5f494e), 
 -                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 -
-+          ACE_NTOHL (0x56657273), 
-+          ACE_NTOHL (0x696f6e53), 
-+          ACE_NTOHL (0x70656300),  // name = VersionSpec
-+          CORBA::tk_string, 
-+          0U, // string length
- 
+-
 -            0U,
-+        5,
-+        ACE_NTOHL (0x74797065), 
-+        ACE_NTOHL (0x0),  // name = type
-+        CORBA::tk_TypeCode,
- 
-+        5,
-+        ACE_NTOHL (0x6d6f6465), 
-+        ACE_NTOHL (0x0),  // name = mode
-+        CORBA::tk_enum, // typecode kind
-+        104, // 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 (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
-+          2, // member count
-+          12,
-+          ACE_NTOHL (0x41545452), 
-+          ACE_NTOHL (0x5f4e4f52), 
+-
++          ACE_NTOHL (0x41545452),
++          ACE_NTOHL (0x5f4e4f52),
 +          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
 +          14,
-+          ACE_NTOHL (0x41545452), 
-+          ACE_NTOHL (0x5f524541), 
-+          ACE_NTOHL (0x444f4e4c), 
++          ACE_NTOHL (0x41545452),
++          ACE_NTOHL (0x5f524541),
++          ACE_NTOHL (0x444f4e4c),
 +          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
  
 -        11,
 +        15,
-+        ACE_NTOHL (0x6765745f), 
++        ACE_NTOHL (0x6765745f),
          ACE_NTOHL (0x65786365), 
          ACE_NTOHL (0x7074696f), 
 -        ACE_NTOHL (0x6e730000),  // name = exceptions
 +        ACE_NTOHL (0x6e730000),  // name = get_exceptions
          CORBA::tk_alias, // typecode kind for typedefs
--        284, // encapsulation length
+-        276, // 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
+@@ -19896,10 +20661,10 @@
+           ACE_NTOHL (0x6f6e5365), 
+           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
            CORBA::tk_sequence, // typecode kind
--          200, // encapsulation length
+-          196, // encapsulation length
 +          476, // encapsulation length
              TAO_ENCAP_BYTE_ORDER, // byte order
              CORBA::tk_struct, // typecode kind
--            184, // encapsulation length
+-            180, // 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
+@@ -19924,23 +20689,97 @@
                5,
                ACE_NTOHL (0x6e616d65), 
                ACE_NTOHL (0x0),  // name = name
+-              0xffffffff, // indirection
+-              0xfffffb08, // negative offset (-1272)
 +              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 (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 (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
+-              0xffffffff, // indirection
+-              0xfffffb4c, // negative offset (-1204)
 +              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 (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 (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
+-              0xffffffff, // indirection
+-              0xfffffb34, // negative offset (-1228)
 +              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 (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 (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
+-              0xffffffff, // indirection
+-              0xfffffb94, // negative offset (-1132)
 +              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 (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 (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
-@@ -19797,120 +20704,159 @@
+@@ -19950,117 +20789,159 @@
              0U,
  
  
@@ -2708,12 +12330,12 @@
 -  ACE_NTOHL (0x69627574), 
 -  ACE_NTOHL (0x65730000),  // name = attributes
 +        15,
-+        ACE_NTOHL (0x7075745f), 
-+        ACE_NTOHL (0x65786365), 
-+        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x7075745f),
++        ACE_NTOHL (0x65786365),
++        ACE_NTOHL (0x7074696f),
 +        ACE_NTOHL (0x6e730000),  // name = put_exceptions
    CORBA::tk_alias, // typecode kind for typedefs
--  416, // encapsulation length
+-  404, // encapsulation length
 +        556, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
 -    41,
@@ -2722,39 +12344,37 @@
      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 (0x412f4578), 
-+          ACE_NTOHL (0x63446573), 
-+          ACE_NTOHL (0x63726970), 
-+          ACE_NTOHL (0x74696f6e), 
-+          ACE_NTOHL (0x5365713a), 
+-    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 (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
 +          18,
-+          ACE_NTOHL (0x45786344), 
-+          ACE_NTOHL (0x65736372), 
-+          ACE_NTOHL (0x69707469), 
-+          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x45786344),
++          ACE_NTOHL (0x65736372),
++          ACE_NTOHL (0x69707469),
++          ACE_NTOHL (0x6f6e5365),
 +          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
      CORBA::tk_sequence, // typecode kind
--    324, // encapsulation length
+-    320, // encapsulation length
 +          476, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
--      308, // encapsulation length
+-      304, // encapsulation length
 +            460, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
@@ -2762,144 +12382,131 @@
          ACE_NTOHL (0x6f6d672e), 
          ACE_NTOHL (0x6f72672f), 
          ACE_NTOHL (0x434f5242), 
--        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x412f4174), 
 -        ACE_NTOHL (0x74726962), 
 -        ACE_NTOHL (0x75746544), 
-+              ACE_NTOHL (0x412f4578), 
-+              ACE_NTOHL (0x63657074), 
-+              ACE_NTOHL (0x696f6e44), 
++              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_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
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
 +              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), 
+         21,
+-        ACE_NTOHL (0x41747472), 
+-        ACE_NTOHL (0x69627574), 
+-        ACE_NTOHL (0x65446573), 
++              ACE_NTOHL (0x45786365),
++              ACE_NTOHL (0x7074696f),
++              ACE_NTOHL (0x6e446573),
+         ACE_NTOHL (0x63726970), 
+         ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x0),  // name = AttributeDescription
+-        6, // member count
 +              ACE_NTOHL (0x0),  // name = ExceptionDescription
 +              5, // member count
          5,
          ACE_NTOHL (0x6e616d65), 
          ACE_NTOHL (0x0),  // name = name
+-        0xffffffff, // indirection
+-        0xfffff9d4, // negative offset (-1580)
 +              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 (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 (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
+-        0xffffffff, // indirection
+-        0xfffffa18, // negative offset (-1512)
 +              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 (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 (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
+-        0xffffffff, // indirection
+-        0xfffffa00, // negative offset (-1536)
 +              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 (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 (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
-+
-         5,
-         ACE_NTOHL (0x74797065), 
-         ACE_NTOHL (0x0),  // name = type
-         CORBA::tk_TypeCode,
- 
+-        0xffffffff, // indirection
+-        0xfffffa60, // negative offset (-1440)
+-        5,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x0),  // name = type
+-        CORBA::tk_TypeCode,
+-
 -        5,
 -        ACE_NTOHL (0x6d6f6465), 
 -        ACE_NTOHL (0x0),  // name = mode
 -        CORBA::tk_enum, // typecode kind
 -        104, // encapsulation length
--          TAO_ENCAP_BYTE_ORDER, // byte order
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
 -          36,
--          ACE_NTOHL (0x49444c3a), 
--          ACE_NTOHL (0x6f6d672e), 
--          ACE_NTOHL (0x6f72672f), 
--          ACE_NTOHL (0x434f5242), 
++                34,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
 -          ACE_NTOHL (0x412f4174), 
 -          ACE_NTOHL (0x74726962), 
 -          ACE_NTOHL (0x7574654d), 
@@ -2911,7 +12518,12 @@
 -          ACE_NTOHL (0x654d6f64), 
 -          ACE_NTOHL (0x65000000),  // name = AttributeMode
 -          2, // member count
--          12,
++                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 (0x41545452), 
 -          ACE_NTOHL (0x5f4e4f52), 
 -          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
@@ -2920,13 +12532,3460 @@
 -          ACE_NTOHL (0x5f524541), 
 -          ACE_NTOHL (0x444f4e4c), 
 -          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
++                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
++        CORBA::tk_TypeCode,
++
 +
 +            0U,
 +
  
  
        0U,
-@@ -22296,11 +23242,6 @@
+@@ -20084,7 +20965,7 @@
+ 
+ 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_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDescription, &_tc_TAO_tc_IR_HomeDescription)
+ TAO_NAMESPACE_END
+ 
+ void IR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
+@@ -20093,58 +20974,12 @@
+   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_ENV_ARG_PARAMETER);
+-    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;
+-}
+-
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::RepositoryIdSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20155,16 +20990,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::RepositoryIdSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::RepositoryIdSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_RepositoryIdSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20174,13 +21003,8 @@
+           IR::RepositoryIdSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20188,29 +21012,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20218,23 +21031,16 @@
+             const IR::RepositoryIdSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::RepositoryIdSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20243,7 +21049,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::RepositoryIdSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20257,22 +21062,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::ComponentDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20283,16 +21081,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ComponentDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ComponentDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ComponentDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20302,13 +21094,8 @@
+           IR::ComponentDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20316,29 +21103,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20346,23 +21122,16 @@
+             const IR::ComponentDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::ComponentDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20371,7 +21140,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ComponentDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20385,22 +21153,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::ProvidesDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20411,16 +21172,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ProvidesDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ProvidesDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20430,13 +21185,8 @@
+           IR::ProvidesDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20444,29 +21194,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20474,23 +21213,16 @@
+             const IR::ProvidesDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::ProvidesDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20499,7 +21231,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ProvidesDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20513,22 +21244,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::UsesDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20539,16 +21263,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::UsesDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::UsesDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_UsesDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20558,13 +21276,8 @@
+           IR::UsesDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20572,29 +21285,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20602,23 +21304,16 @@
+             const IR::UsesDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::UsesDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20627,7 +21322,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::UsesDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20641,22 +21335,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::HomeDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20667,16 +21354,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::HomeDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::HomeDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_HomeDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20686,13 +21367,8 @@
+           IR::HomeDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20700,29 +21376,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20730,23 +21395,16 @@
+             const IR::HomeDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::HomeDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20755,7 +21413,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::HomeDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20769,22 +21426,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::EmitsDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20795,16 +21445,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::EmitsDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::EmitsDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_EmitsDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20814,13 +21458,8 @@
+           IR::EmitsDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20828,29 +21467,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20858,23 +21486,16 @@
+             const IR::EmitsDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::EmitsDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -20883,7 +21504,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::EmitsDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -20897,22 +21517,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::PublishesDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -20921,18 +21534,12 @@
+           stream.begin ()
+         );
+     }
+-}
+-
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::PublishesDefSeq *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
++}
+   
+-  if (stream << *_tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR::PublishesDefSeq *_tao_elem) // non copying
+     {
++  TAO_OutputCDR stream;
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_PublishesDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -20942,13 +21549,8 @@
+           IR::PublishesDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -20956,29 +21558,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -20986,23 +21577,16 @@
+             const IR::PublishesDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::PublishesDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21011,7 +21595,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::PublishesDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21025,22 +21608,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::ConsumesDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -21051,16 +21627,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ConsumesDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ConsumesDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -21070,13 +21640,8 @@
+           IR::ConsumesDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -21084,29 +21649,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -21114,23 +21668,16 @@
+             const IR::ConsumesDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::ConsumesDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21139,7 +21686,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ConsumesDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21153,22 +21699,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::FactoryDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -21179,16 +21718,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::FactoryDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::FactoryDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_FactoryDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -21198,13 +21731,8 @@
+           IR::FactoryDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -21212,29 +21740,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -21242,23 +21759,16 @@
+             const IR::FactoryDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::FactoryDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21267,7 +21777,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::FactoryDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21281,22 +21790,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::FinderDefSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -21307,16 +21809,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::FinderDefSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::FinderDefSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_FinderDefSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -21326,13 +21822,8 @@
+           IR::FinderDefSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -21340,29 +21831,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -21370,23 +21850,16 @@
+             const IR::FinderDefSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::FinderDefSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21395,7 +21868,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::FinderDefSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21409,21 +21881,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -21437,53 +21900,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ComponentRepository_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_ComponentRepository, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_ComponentRepository
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -21492,15 +21925,15 @@
+             _tao_elem,
+             IR::ComponentRepository::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::ComponentRepository::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::ComponentRepository::_nil ();
+   return 0;
+ }
+@@ -21512,17 +21945,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -21536,53 +21961,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ProvidesDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_ProvidesDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_ProvidesDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -21591,15 +21986,15 @@
+             _tao_elem,
+             IR::ProvidesDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::ProvidesDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::ProvidesDef::_nil ();
+   return 0;
+ }
+@@ -21611,38 +22006,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::ProvidesDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::ProvidesDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ProvidesDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ProvidesDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ProvidesDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -21652,43 +22030,24 @@
+           IR::ProvidesDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -21696,23 +22055,16 @@
+             const IR::ProvidesDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::ProvidesDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::ProvidesDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::ProvidesDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21721,7 +22073,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ProvidesDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21735,21 +22086,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -21763,53 +22105,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::UsesDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_UsesDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_UsesDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -21818,15 +22130,15 @@
+             _tao_elem,
+             IR::UsesDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::UsesDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::UsesDef::_nil ();
+   return 0;
+ }
+@@ -21838,38 +22150,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::UsesDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::UsesDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_UsesDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::UsesDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::UsesDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_UsesDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -21879,43 +22174,24 @@
+           IR::UsesDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++
++    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -21923,23 +22199,16 @@
+             const IR::UsesDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::UsesDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::UsesDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::UsesDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -21948,7 +22217,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::UsesDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -21962,22 +22230,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::ProvidesDescSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -21988,16 +22249,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ProvidesDescSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ProvidesDescSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -22007,13 +22262,8 @@
+           IR::ProvidesDescSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -22021,29 +22271,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -22051,23 +22290,16 @@
+             const IR::ProvidesDescSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::ProvidesDescSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -22076,7 +22308,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ProvidesDescSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -22090,22 +22321,15 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_sequence/any_op_cs.cpp:61
+-
+-// Copying insertion.
+ void operator<<= (
+     CORBA::Any &_tao_any,
+     const IR::UsesDescSeq &_tao_elem
+-  )
++  ) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+   if (stream << _tao_elem)
+     {
+       _tao_any._tao_replace (
+@@ -22116,16 +22340,10 @@
+     }
+ }
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::UsesDescSeq *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::UsesDescSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_UsesDescSeq,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -22135,13 +22353,8 @@
+           IR::UsesDescSeq::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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*&,
+@@ -22149,29 +22362,18 @@
+     );
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      {
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -22179,23 +22381,16 @@
+             const IR::UsesDescSeq*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+-        IR::UsesDescSeq *tmp = 0;
+-        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 ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -22204,7 +22399,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::UsesDescSeq::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -22218,21 +22412,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22246,53 +22431,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::EventDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_EventDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_EventDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -22301,15 +22456,15 @@
+             _tao_elem,
+             IR::EventDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::EventDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::EventDef::_nil ();
+   return 0;
+ }
+@@ -22321,38 +22476,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::EventDef,IR::EventDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::EventDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::EventDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_EventDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::EventDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::EventDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_EventDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -22362,43 +22500,24 @@
+           IR::EventDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -22406,23 +22525,16 @@
+             const IR::EventDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::EventDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::EventDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::EventDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -22431,7 +22543,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::EventDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -22445,21 +22556,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22473,53 +22575,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::EmitsDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_EmitsDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_EmitsDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -22528,15 +22600,15 @@
+             _tao_elem,
+             IR::EmitsDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::EmitsDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::EmitsDef::_nil ();
+   return 0;
+ }
+@@ -22548,17 +22620,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22572,53 +22636,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::PublishesDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_PublishesDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_PublishesDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -22627,15 +22661,15 @@
+             _tao_elem,
+             IR::PublishesDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::PublishesDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::PublishesDef::_nil ();
+   return 0;
+ }
+@@ -22647,17 +22681,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22671,53 +22697,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ConsumesDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_ConsumesDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_ConsumesDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -22726,15 +22722,15 @@
+             _tao_elem,
+             IR::ConsumesDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::ConsumesDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::ConsumesDef::_nil ();
+   return 0;
+ }
+@@ -22746,17 +22742,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22770,53 +22758,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ComponentDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_ComponentDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_ComponentDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -22825,15 +22783,15 @@
+             _tao_elem,
+             IR::ComponentDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::ComponentDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::ComponentDef::_nil ();
+   return 0;
+ }
+@@ -22845,38 +22803,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::ComponentDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::ComponentDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ComponentDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::ComponentDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::ComponentDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_ComponentDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -22886,43 +22827,24 @@
+           IR::ComponentDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -22930,23 +22852,16 @@
+             const IR::ComponentDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::ComponentDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::ComponentDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::ComponentDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -22955,7 +22870,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::ComponentDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -22969,21 +22883,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -22997,53 +22902,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::PrimaryKeyDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_PrimaryKeyDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_PrimaryKeyDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -23052,15 +22927,15 @@
+             _tao_elem,
+             IR::PrimaryKeyDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::PrimaryKeyDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::PrimaryKeyDef::_nil ();
+   return 0;
+ }
+@@ -23072,38 +22947,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::PrimaryKeyDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::PrimaryKeyDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_PrimaryKeyDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::PrimaryKeyDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_PrimaryKeyDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -23113,43 +22971,24 @@
+           IR::PrimaryKeyDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -23157,23 +22996,16 @@
+             const IR::PrimaryKeyDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::PrimaryKeyDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::PrimaryKeyDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::PrimaryKeyDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -23182,7 +23014,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::PrimaryKeyDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -23196,21 +23027,12 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -23224,53 +23046,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::FactoryDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_FactoryDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_FactoryDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -23279,15 +23071,15 @@
+             _tao_elem,
+             IR::FactoryDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::FactoryDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::FactoryDef::_nil ();
+   return 0;
+ }
+@@ -23299,17 +23091,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -23323,53 +23107,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::FinderDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_FinderDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_FinderDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -23378,15 +23132,15 @@
+             _tao_elem,
+             IR::FinderDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::FinderDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::FinderDef::_nil ();
+   return 0;
+ }
+@@ -23398,17 +23152,9 @@
+ #  pragma instantiate TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_interface/any_op_cs.cpp:60
+-
+-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)
+     {
+       _tao_any._tao_replace (
+@@ -23422,53 +23168,23 @@
+     }
+ }
+ 
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::HomeDef_ptr *_tao_elem
+-  )
+-{
+-  TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
+-      _tao_any._tao_replace (
+-          IR::_tc_HomeDef, 
+-          TAO_ENCAP_BYTE_ORDER,
+-          stream.begin (),
+-          1,
+-          *_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 ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result =
+-      type->equivalent (
+-          IR::_tc_HomeDef
+-          ACE_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef ACE_ENV_ARG_PARAMETER);
+     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 (
+@@ -23477,15 +23193,15 @@
+             _tao_elem,
+             IR::HomeDef::_tao_any_destructor
+           );
+-        
+         return 1;
+       }
+   }
+   ACE_CATCHANY
+   {
++    _tao_elem = IR::HomeDef::_nil ();
++    return 0;
+   }
+   ACE_ENDTRY;
+-  
+   _tao_elem = IR::HomeDef::_nil ();
+   return 0;
+ }
+@@ -23497,38 +23213,21 @@
+ #  pragma instantiate TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
+-
+-// TAO_IDL - Generated from 
+-// be/be_visitor_structure/any_op_cs.cpp:58
+-
+-// Copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    const IR::HomeDescription &_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, const IR::HomeDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << _tao_elem)
+-    {
++  stream << _tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_HomeDescription,
+           TAO_ENCAP_BYTE_ORDER,
+           stream.begin ()
+         );
+     }
+-}
+ 
+-// Non-copying insertion.
+-void operator<<= (
+-    CORBA::Any &_tao_any,
+-    IR::HomeDescription *_tao_elem
+-  )
++void operator<<= (CORBA::Any &_tao_any, IR::HomeDescription *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+-  
+-  if (stream << *_tao_elem)
+-    {
++  stream << *_tao_elem;
+       _tao_any._tao_replace (
+           IR::_tc_HomeDescription,
+           TAO_ENCAP_BYTE_ORDER,
+@@ -23538,43 +23237,24 @@
+           IR::HomeDescription::_tao_any_destructor
+         );
+     }
+-}
+ 
+-// Extraction to non-const pointer (deprecated).
+-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);
+ }
+ 
+-// Extraction to const pointer.
+-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_ENV_ARG_PARAMETER
+-        );
++    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription ACE_ENV_ARG_PARAMETER);
+     ACE_TRY_CHECK;
+     
+-    if (result == 0)
+-      {
++    if (!result)
+         return 0; // not equivalent
+-      }
+     
+     if (_tao_any.any_owns_data ())
+       {
+@@ -23582,23 +23262,16 @@
+             const IR::HomeDescription*,
+             _tao_any.value ()
+           );
+-        
+         return 1;
+       }
+     else
+       {
+         IR::HomeDescription *tmp;
+-        ACE_NEW_RETURN (
+-            tmp,
+-            IR::HomeDescription,
+-            0
+-          );
+-        
++      ACE_NEW_RETURN (tmp, IR::HomeDescription, 0);
+         TAO_InputCDR stream (
+             _tao_any._tao_get_cdr (),
+             _tao_any._tao_byte_order ()
+           );
+-        
+         if (stream >> *tmp)
+           {
+             ((CORBA::Any *)&_tao_any)->_tao_replace (
+@@ -23607,7 +23280,6 @@
+                 ACE_static_cast (void *, tmp),
+                 IR::HomeDescription::_tao_any_destructor
+               );
+-            
+             _tao_elem = tmp;
+             return 1;
+           }
+@@ -23621,7 +23293,6 @@
+   {
+   }
+   ACE_ENDTRY;
+-  
+   return 0;
+ }
+ 
+@@ -23656,11 +23327,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2938,7 +15997,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22343,11 +23284,6 @@
+@@ -23703,11 +23369,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2950,7 +16009,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22390,11 +23326,6 @@
+@@ -23750,11 +23411,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2962,7 +16021,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22437,11 +23368,6 @@
+@@ -23797,11 +23453,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2974,7 +16033,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22484,11 +23410,6 @@
+@@ -23844,11 +23495,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2986,7 +16045,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22531,11 +23452,6 @@
+@@ -23891,11 +23537,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -2998,7 +16057,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22578,11 +23494,6 @@
+@@ -23938,11 +23579,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3010,7 +16069,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22625,11 +23536,6 @@
+@@ -23985,11 +23621,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3022,7 +16081,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22672,11 +23578,6 @@
+@@ -24032,11 +23663,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3034,7 +16093,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22719,11 +23620,6 @@
+@@ -24079,11 +23705,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3046,7 +16105,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22874,11 +23770,6 @@
+@@ -24234,11 +23855,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3058,7 +16117,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22921,11 +23812,6 @@
+@@ -24281,11 +23897,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -3070,3 +16129,8 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -24620,4 +24231,3 @@
+   ACE_ENDTRY;
+   return 0;
+ }
+-