ChangeLogTag: Thu Jan 9 18:51:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

author: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-01-10 01:01:15 +0000
committer: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-01-10 01:01:15 +0000
commit: 6a05720b40f11fc4beae88d68e578ca2477b347a (patch)
tree: 02ad6881de0dad301615f5dabf1fbf666a045561
parent: 4900ff32cde5c498fd71546a9bb59e1e336a99b8 (diff)
download: ATCD-6a05720b40f11fc4beae88d68e578ca2477b347a.tar.gz
139 files changed, 16510 insertions, 10653 deletions
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index 594b1e909de..bb1891742ce 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -52,7 +52,7 @@ public:
    * selected acceptors (endpoints) from the array delimited by
    * <acceptors_begin> and <acceptors_end>.
    */
-  virtual int fill_profile (const TAO_ObjectKey &object_key,
+  virtual int fill_profile (const TAO::ObjectKey &object_key,
                             TAO_MProfile &mprofile,
                             TAO_Acceptor **acceptors_begin,
                             TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index c5951915b33..bb7a26db570 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -133,7 +133,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
 }
 
 void
-TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
+TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
                                 TAO_ServerRequest &request,
                                 CORBA::Object_out forward_to
                                 ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index b25c45d95aa..77f8106b46d 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -61,7 +61,7 @@ public:
   virtual int priority (void) const = 0;
 
   /// Return the status....
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to
                         ACE_ENV_ARG_DECL)
@@ -140,7 +140,7 @@ public:
    * It tries the adapters ordered by priority, stopping when the
    * adapter returns a status different from DS_MISMATCHED_KEY
    */
-  void dispatch (TAO_ObjectKey &key,
+  void dispatch (TAO::ObjectKey &key,
                  TAO_ServerRequest &request,
                  CORBA::Object_out forward_to
                  ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index b412b4d6f13..0443a1dfbda 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -45,10 +45,11 @@ namespace CORBA
   public:
 
 // ********** TEMPORARY *********************
-    typedef void (*_tao_destructor)(void *);
+//    typedef void (*_tao_destructor)(void *);
     void _tao_replace (CORBA::TypeCode_ptr,
                        int byte_order,
                        const ACE_Message_Block *mb) {}
+/*
     void _tao_replace (CORBA::TypeCode_ptr type,
                        int byte_order,
                        const ACE_Message_Block *mb,
@@ -59,9 +60,8 @@ namespace CORBA
                        CORBA::Boolean any_owns_data,
                        void* value,
                        CORBA::Any::_tao_destructor destructor) {}
-    CORBA::Boolean any_owns_data (void) const { return 0; }
-//    CORBA::Boolean contains_local (void) const { return 0; }
-//    void contains_local (CORBA::Boolean) {}
+*/
+//    CORBA::Boolean any_owns_data (void) const { return 0; }
     CORBA::TypeCode_ptr type_;
     ACE_Message_Block *cdr_;
     void _tao_encode (TAO_OutputCDR &cdr,
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
index 7c61ef01bef..c8ccda63db3 100644
--- a/TAO/tao/Bounds.pidl
+++ b/TAO/tao/Bounds.pidl
@@ -10,7 +10,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
@@ -43,6 +43,4 @@ module CORBA
   exception Bounds {};
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_BOUNDS_PIDL */
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 6052f19ba43..5e35fb4e03f 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "BoundsC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "BoundsC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,26 +44,29 @@
 #include "BoundsC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::Bounds::Bounds (void)
-  : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0",
-                         "Bounds")
+  : CORBA_UserException (
+        "IDL:omg.org/CORBA/Bounds:1.0",
+        "Bounds"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::Bounds::~Bounds (void)
 {
 }
 
-// Copy constructor.
 CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA_UserException (_tao_excp._rep_id (),
-                         _tao_excp._name ())
+  : CORBA_UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 CORBA::Bounds&
 CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
 {
@@ -73,11 +81,11 @@ void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception *exc)
+CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Bounds *, exc);
+      return ACE_dynamic_cast (Bounds *, _tao_excp);
     }
   else
     {
@@ -98,13 +106,13 @@ CORBA::Bounds::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::Bounds (*this),
+      ::CORBA::Bounds (*this),
       0
     );
   return result;
 }
 
-void CORBA::Bounds::_raise ()
+void CORBA::Bounds::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -118,7 +126,7 @@ void CORBA::Bounds::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -131,27 +139,36 @@ void CORBA::Bounds::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
+{
+  return ::CORBA::_tc_Bounds;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_Bounds[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f426f),
-  ACE_NTOHL (0x756e6473),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f426f), 
+  ACE_NTOHL (0x756e6473), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Bounds:1.0
-  7,
-  ACE_NTOHL (0x426f756e),
+    7,
+  ACE_NTOHL (0x426f756e), 
   ACE_NTOHL (0x64730000),  // name = Bounds
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
     CORBA::tk_except,
@@ -163,102 +180,75 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Bounds, &_tc_TAO_tc_CORBA_Bounds)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Bounds,
+    &_tc_TAO_tc_CORBA_Bounds
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Bounds &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Bounds &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert_copy (
+      _tao_any,
+      CORBA::Bounds::_tao_any_destructor,
       CORBA::_tc_Bounds,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Bounds *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Bounds *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert (
+      _tao_any,
+      CORBA::Bounds::_tao_any_destructor,
       CORBA::_tc_Bounds,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::Bounds::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Bounds *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::Bounds*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::Bounds *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Bounds *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Bounds *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Bounds>::extract (
+        _tao_any,
+        CORBA::Bounds::_tao_any_destructor,
+        CORBA::_tc_Bounds,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Bounds>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Bounds>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Bounds *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::Bounds *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Bounds, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/Bounds:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Bounds,
-            1,
-            tmp,
-            CORBA::Bounds::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index db2b97ea744..e45cf7a4e6f 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_BOUNDSC_H_
 #define _TAO_IDL_ORIG_BOUNDSC_H_
 
@@ -56,9 +59,15 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_BOUNDS_CH_)
 #define _CORBA_BOUNDS_CH_
   
@@ -71,9 +80,9 @@ TAO_NAMESPACE  CORBA
     ~Bounds (void);
 
     Bounds &operator= (const Bounds &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Bounds *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -91,32 +100,51 @@ TAO_NAMESPACE  CORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Bounds;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Bounds;
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Bounds *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "BoundsC.i"
@@ -132,3 +160,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i
index 0f43cefabd4..2e83c822e08 100644
--- a/TAO/tao/BoundsC.i
+++ b/TAO/tao/BoundsC.i
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 //
 // $Id$
+
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -18,20 +19,33 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception CORBA::Bounds
-// *************************************************************
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Bounds &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::Bounds &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,CORBA::Bounds&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::Bounds&
+  )
 {
   return 1;
 }
+
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 64ef31c26b4..a26ed5325bb 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -21,4 +21,3 @@ module CONV_FRAME {
   };
 };
 
-#pragma prefix ""
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index e4b780a43ff..c353e9d5f13 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -1,708 +1,722 @@
+// -*- C++ -*-
 //
 // $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
 #include "tao/CONV_FRAMEC.h"
-#include "tao/Any.h"
-#include "tao/Typecode.h"
+#include "tao/Any_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMEC.i"
+#include "CONV_FRAMEC.i"
 #endif /* !defined INLINE */
 
-void
-CONV_FRAME::CodeSetComponent::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetComponent *tmp = ACE_static_cast(CONV_FRAME::CodeSetComponent*,x);
-  delete tmp;
-}
-
-void
-CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetComponentInfo *tmp = ACE_static_cast(CONV_FRAME::CodeSetComponentInfo*,x);
-  delete tmp;
-}
-
-void
-CONV_FRAME::CodeSetContext::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetContext *tmp = ACE_static_cast(CONV_FRAME::CodeSetContext*,x);
-  delete tmp;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-  10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-  CORBA::tk_ulong,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x65744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+    10,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657449), 
+  ACE_NTOHL (0x64000000),  // name = CodeSetId
+    CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (CORBA::tk_alias, sizeof (_oc_CONV_FRAME_CodeSetId), (char *) &_oc_CONV_FRAME_CodeSetId, 0, sizeof (CONV_FRAME::CodeSetId));
+
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
+    CORBA::tk_alias,
+    sizeof (_oc_CONV_FRAME_CodeSetId),
+    (char *) &_oc_CONV_FRAME_CodeSetId,
+    0,
+    sizeof (CONV_FRAME::CodeSetId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetId, &_tc_TAO_tc_CONV_FRAME_CodeSetId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetId,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetId
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-  17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
+    17,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x0),  // name = CodeSetComponent
   2, // member count
-  16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-  CORBA::tk_alias, // typecode kind for typedefs
+    16,
+  ACE_NTOHL (0x6e617469), 
+  ACE_NTOHL (0x76655f63), 
+  ACE_NTOHL (0x6f64655f), 
+  ACE_NTOHL (0x73657400),  // name = native_code_set
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+        10,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
+    ACE_NTOHL (0x64000000),  // name = CodeSetId
+        CORBA::tk_ulong,
 
 
-  21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
+  21,
+  ACE_NTOHL (0x636f6e76), 
+  ACE_NTOHL (0x65727369), 
+  ACE_NTOHL (0x6f6e5f63), 
+  ACE_NTOHL (0x6f64655f), 
+  ACE_NTOHL (0x73657473), 
+  ACE_NTOHL (0x0),  // name = conversion_code_sets
+    CORBA::tk_sequence, // typecode kind
+  16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
+    0xffffffff, // indirection
+    0xffffff88, // negative offset (-120)
+    0U,
 
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetComponent),
+    (char *) &_oc_CONV_FRAME_CodeSetComponent,
     0,
+    sizeof (CONV_FRAME::CodeSetComponent)
+  );
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponent), (char *) &_oc_CONV_FRAME_CodeSetComponent, 0, sizeof (CONV_FRAME::CodeSetComponent));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponent, &_tc_TAO_tc_CONV_FRAME_CodeSetComponent)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetComponent,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodeSetComponent *tmp = ACE_static_cast (CodeSetComponent*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
 
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-
-    if (this->buffer_ != 0)
+void
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ULong* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
+  
+  if (this->buffer_ != 0)
     {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
+      CORBA::ULong *old =
+        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
+        {
+          tmp[i] = old[i];
+        }
+      
       if (this->release_)
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-
+        {
+          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
+        }
     }
-    this->buffer_ = tmp;
-  }
+  
+  this->buffer_ = tmp;
+}
 
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
+void
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
       return;
-
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-    CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
+    }
+  
+  CORBA::ULong *tmp =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
+{
+  this->_deallocate_buffer ();
+}
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
 #define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
 // *************************************************************
 
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void)
 {}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max) // uses max size
-  :
+
+CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  :
+
+CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) // copy ctor
-  :
+
+CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
 {}
 
+void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void *_tao_void_pointer)
+{
+  _tao_seq_CodeSetId *tmp = ACE_static_cast (_tao_seq_CodeSetId*, _tao_void_pointer);
+  delete tmp;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7449), ACE_NTOHL (0x6e666f3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-  21, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x496e666f), ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
+    21,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x496e666f), 
+  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
   2, // member count
-  12, ACE_NTOHL (0x466f7243), ACE_NTOHL (0x68617244), ACE_NTOHL (0x61746100),  // name = ForCharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
+    12,
+  ACE_NTOHL (0x466f7243), 
+  ACE_NTOHL (0x68617244), 
+  ACE_NTOHL (0x61746100),  // name = ForCharData
+    CORBA::tk_struct, // typecode kind
+  228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
+    44,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x6574436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e743a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
+        17,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657443), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = CodeSetComponent
     2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
+        16,
+    ACE_NTOHL (0x6e617469), 
+    ACE_NTOHL (0x76655f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657400),  // name = native_code_set
+        CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    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
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-  13, ACE_NTOHL (0x466f7257), ACE_NTOHL (0x63686172), ACE_NTOHL (0x44617461), ACE_NTOHL (0x0),  // name = ForWcharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
+      37,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+            10,
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
+      ACE_NTOHL (0x64000000),  // name = CodeSetId
+            CORBA::tk_ulong,
+
+
+    21,
+    ACE_NTOHL (0x636f6e76), 
+    ACE_NTOHL (0x65727369), 
+    ACE_NTOHL (0x6f6e5f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657473), 
+    ACE_NTOHL (0x0),  // name = conversion_code_sets
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
+      0xffffffff, // indirection
+      0xffffff88, // negative offset (-120)
+      0U,
+
+
+  13,
+  ACE_NTOHL (0x466f7257), 
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x0),  // name = ForWcharData
+    0xffffffff, // indirection
+  0xfffffefc, // negative offset (-260)
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
+    (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
+    0,
+    sizeof (CONV_FRAME::CodeSetComponentInfo)
+  );
 
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    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
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CONV_FRAME)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetComponentInfo,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo
+  )
+TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
 
-      0,
+void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodeSetComponentInfo *tmp = ACE_static_cast (CodeSetComponentInfo*, _tao_void_pointer);
+  delete tmp;
+}
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponentInfo), (char *) &_oc_CONV_FRAME_CodeSetComponentInfo, 0, sizeof (CONV_FRAME::CodeSetComponentInfo));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponentInfo, &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo)
-TAO_NAMESPACE_END
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-  15, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = CodeSetContext
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
+    15,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78740000),  // name = CodeSetContext
   2, // member count
-  10, ACE_NTOHL (0x63686172), ACE_NTOHL (0x5f646174), ACE_NTOHL (0x61000000),  // name = char_data
-  CORBA::tk_alias, // typecode kind for typedefs
+    10,
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x5f646174), 
+  ACE_NTOHL (0x61000000),  // name = char_data
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+        10,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
+    ACE_NTOHL (0x64000000),  // name = CodeSetId
+        CORBA::tk_ulong,
 
 
-  11, ACE_NTOHL (0x77636861), ACE_NTOHL (0x725f6461), ACE_NTOHL (0x74610000),  // name = wchar_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+  11,
+  ACE_NTOHL (0x77636861), 
+  ACE_NTOHL (0x725f6461), 
+  ACE_NTOHL (0x74610000),  // name = wchar_data
+    0xffffffff, // indirection
+  0xffffffa0, // negative offset (-96)
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetContext),
+    (char *) &_oc_CONV_FRAME_CodeSetContext,
+    0,
+    sizeof (CONV_FRAME::CodeSetContext)
+  );
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetContext), (char *) &_oc_CONV_FRAME_CodeSetContext, 0, sizeof (CONV_FRAME::CodeSetContext));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetContext, &_tc_TAO_tc_CONV_FRAME_CodeSetContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetContext,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetContext
+  )
 TAO_NAMESPACE_END
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  CodeSetContext *tmp = ACE_static_cast (CodeSetContext*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponent &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponent *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponent *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponent,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetComponent::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetComponent *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponent *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetComponent *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponent,
-            1,
-            ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem),
-            CONV_FRAME::CodeSetComponent::_tao_any_destructor
-           );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetComponent::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetComponent,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponentInfo &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponentInfo &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponentInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponentInfo *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponentInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponentInfo *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponentInfo,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetComponentInfo *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponentInfo *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetComponentInfo *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponentInfo,
-            1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem)),
-            CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetComponentInfo,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetContext &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetContext &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetContext::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetContext *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetContext::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetContext *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetContext,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetContext::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetContext *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetContext *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetContext *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetContext *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetContext,
-            1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem)),
-            CONV_FRAME::CodeSetContext::_tao_any_destructor
-            );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetContext::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetContext,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -711,12 +725,32 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
+
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ */
+
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 0846ca891f8..345c281055d 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -1,24 +1,31 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
+#define _TAO_IDL_ORIG_CONV_FRAMEC_H_
 
-//=============================================================================
-/**
- *  @file   CONV_FRAMEC.h
- *
- *  $Id$
- *
- * Generated from CONV_FRAME.pidl, that contains the OMG standarized
- * CONV_FRAME module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef TAO_CONV_FRAMEC_H
-#define TAO_CONV_FRAMEC_H
 #include "ace/pre.h"
-
 #include "tao/CDR.h"
 #include "tao/Sequence.h"
 
@@ -31,6 +38,14 @@
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -38,185 +53,180 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CONV_FRAME
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetId;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetComponent_var;
+  
   struct TAO_Export CodeSetComponent
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetId native_code_set;
+    typedef CodeSetComponent_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CONV_FRAME::CodeSetId native_code_set;
+    
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
-      class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId : public TAO_Unbounded_Base_Sequence
-      {
-      public:
-        // = Initialization and termination methods.
-
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Default constructor.
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
+    
+    class TAO_Export _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
+          CORBA::ULong maximum,
           CORBA::ULong length,
           CORBA::ULong *data,
-          CORBA::Boolean release = 0);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Dtor.
-        // = Accessors.
-        CORBA::ULong &operator[] (CORBA::ULong i);
-        const CORBA::ULong &operator[] (CORBA::ULong i) const;
-        // = Static operations.
-        static CORBA::ULong *allocbuf (CORBA::ULong size);
-        static void freebuf (CORBA::ULong *buffer);
-        virtual void _allocate_buffer (CORBA::ULong length);
-        virtual void _deallocate_buffer (void);
-        // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-        CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-        const CORBA::ULong *get_buffer (void) const;
-        void replace (CORBA::ULong max,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
+          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
+        );
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (
+          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
+      
+      // = Accessors.
+      CORBA::ULong &operator[] (CORBA::ULong i);
+      const CORBA::ULong &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static CORBA::ULong *allocbuf (CORBA::ULong size);
+      static void freebuf (CORBA::ULong *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA::ULong *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
           CORBA::ULong length,
           CORBA::ULong *data,
-          CORBA::Boolean release);
-      };
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
 #define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class _tao_seq_CodeSetId;
+    
     // *************************************************************
-    // _tao_seq_CodeSetId
+    // CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
     // *************************************************************
+    
+    class TAO_Export _tao_seq_CodeSetId : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-    class TAO_Export _tao_seq_CodeSetId : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+    _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-      TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_CodeSetId (void); // default ctor
-      _tao_seq_CodeSetId (CORBA::ULong max); // uses max size
-      _tao_seq_CodeSetId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); // copy ctor
-      ~_tao_seq_CodeSetId (void); // dtor
-    };
-    typedef _tao_seq_CodeSetId *_tao_seq_CodeSetId_ptr;
-
-#endif /* end #if !defined */
-
+    TAO_Unbounded_Sequence<CORBA::ULong>
 
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_
-
-// *************************************************************
-    // class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId_var
-    {
-    public:
-      _tao_seq_CodeSetId_var (void); // default constructor
-      _tao_seq_CodeSetId_var (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var (const _tao_seq_CodeSetId_var &); // copy constructor
-      ~_tao_seq_CodeSetId_var (void); // destructor
-
-      _tao_seq_CodeSetId_var &operator= (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var &operator= (const _tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId *operator-> (void);
-      const _tao_seq_CodeSetId *operator-> (void) const;
-
-      operator const _tao_seq_CodeSetId &() const;
-      operator _tao_seq_CodeSetId &();
-      operator _tao_seq_CodeSetId &() const;
-      CodeSetId &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_CodeSetId &in (void) const;
-      _tao_seq_CodeSetId &inout (void);
-      _tao_seq_CodeSetId *&out (void);
-      _tao_seq_CodeSetId *_retn (void);
-      _tao_seq_CodeSetId *ptr (void) const;
-
-    private:
-      _tao_seq_CodeSetId *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_
-
-    class TAO_Export _tao_seq_CodeSetId_out
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId *&);
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId_out (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (_tao_seq_CodeSetId *);
-      operator _tao_seq_CodeSetId *&();
-      _tao_seq_CodeSetId *&ptr (void);
-      _tao_seq_CodeSetId *operator-> (void);
-      CodeSetId &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_CodeSetId *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_CodeSetId_var &);
+      _tao_seq_CodeSetId (void);
+      _tao_seq_CodeSetId (CORBA::ULong max);
+      _tao_seq_CodeSetId (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::ULong *buffer, 
+          CORBA::Boolean release = 0
+        );
+      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &);
+      ~_tao_seq_CodeSetId (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      
     };
 
-
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_CodeSetId _conversion_code_sets_seq;
     _tao_seq_CodeSetId conversion_code_sets;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetComponent_var
   {
   public:
-    CodeSetComponent_var (void); // default constructor
+    CodeSetComponent_var (void);
     CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &); // copy constructor
-    ~CodeSetComponent_var (void); // destructor
-
+    CodeSetComponent_var (const CodeSetComponent_var &);
+    ~CodeSetComponent_var (void);
+    
     CodeSetComponent_var &operator= (CodeSetComponent *);
     CodeSetComponent_var &operator= (const CodeSetComponent_var &);
     CodeSetComponent *operator-> (void);
     const CodeSetComponent *operator-> (void) const;
-
+    
     operator const CodeSetComponent &() const;
     operator CodeSetComponent &();
     operator CodeSetComponent &() const;
-    // in, inout, out, _retn
+    
+    // Variable-size types only.
+    operator CodeSetComponent *&();
+    
+    // in, inout, out, _retn 
     const CodeSetComponent &in (void) const;
     CodeSetComponent &inout (void);
     CodeSetComponent *&out (void);
     CodeSetComponent *_retn (void);
     CodeSetComponent *ptr (void) const;
-
+  
   private:
     CodeSetComponent *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export CodeSetComponent_out
   {
   public:
@@ -228,50 +238,69 @@ TAO_NAMESPACE  CONV_FRAME
     operator CodeSetComponent *&();
     CodeSetComponent *&ptr (void);
     CodeSetComponent *operator-> (void);
-
+    
   private:
     CodeSetComponent *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const CodeSetComponent_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponent;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetComponentInfo_var;
+  
   struct TAO_Export CodeSetComponentInfo
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetComponent ForCharData;
-    CodeSetComponent ForWcharData;
+    typedef CodeSetComponentInfo_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CONV_FRAME::CodeSetComponent ForCharData;
+    CONV_FRAME::CodeSetComponent ForWcharData;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetComponentInfo_var
   {
   public:
-    CodeSetComponentInfo_var (void); // default constructor
+    CodeSetComponentInfo_var (void);
     CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &); // copy constructor
-    ~CodeSetComponentInfo_var (void); // destructor
-
+    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &);
+    ~CodeSetComponentInfo_var (void);
+    
     CodeSetComponentInfo_var &operator= (CodeSetComponentInfo *);
     CodeSetComponentInfo_var &operator= (const CodeSetComponentInfo_var &);
     CodeSetComponentInfo *operator-> (void);
     const CodeSetComponentInfo *operator-> (void) const;
-
+    
     operator const CodeSetComponentInfo &() const;
     operator CodeSetComponentInfo &();
     operator CodeSetComponentInfo &() const;
-    // in, inout, out, _retn
+    
+    // Variable-size types only.
+    operator CodeSetComponentInfo *&();
+    
+    // in, inout, out, _retn 
     const CodeSetComponentInfo &in (void) const;
     CodeSetComponentInfo &inout (void);
     CodeSetComponentInfo *&out (void);
     CodeSetComponentInfo *_retn (void);
     CodeSetComponentInfo *ptr (void) const;
-
+  
   private:
     CodeSetComponentInfo *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export CodeSetComponentInfo_out
   {
   public:
@@ -283,108 +312,169 @@ TAO_NAMESPACE  CONV_FRAME
     operator CodeSetComponentInfo *&();
     CodeSetComponentInfo *&ptr (void);
     CodeSetComponentInfo *operator-> (void);
-
+    
   private:
     CodeSetComponentInfo *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const CodeSetComponentInfo_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetContext_var;
+  
   struct TAO_Export CodeSetContext
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetId char_data;
-    CodeSetId wchar_data;
+    typedef CodeSetContext_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CONV_FRAME::CodeSetId char_data;
+    CONV_FRAME::CodeSetId wchar_data;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetContext_var
   {
   public:
-    CodeSetContext_var (void); // default constructor
+    CodeSetContext_var (void);
     CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &); // copy constructor
-    ~CodeSetContext_var (void); // destructor
-
+    CodeSetContext_var (const CodeSetContext_var &);
+    // Fixed-size types only.
+    CodeSetContext_var (const CodeSetContext &);
+    ~CodeSetContext_var (void);
+    
     CodeSetContext_var &operator= (CodeSetContext *);
     CodeSetContext_var &operator= (const CodeSetContext_var &);
+    
+    // Fixed-size types only.
+    CodeSetContext_var &operator= (const CodeSetContext &);
+    
     CodeSetContext *operator-> (void);
     const CodeSetContext *operator-> (void) const;
-
+    
     operator const CodeSetContext &() const;
     operator CodeSetContext &();
     operator CodeSetContext &() const;
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const CodeSetContext &in (void) const;
     CodeSetContext &inout (void);
     CodeSetContext &out (void);
     CodeSetContext _retn (void);
     CodeSetContext *ptr (void) const;
-
+  
   private:
     CodeSetContext *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef CodeSetContext &CodeSetContext_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetContext;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CONV_FRAME
 
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetComponent *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetComponentInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetComponentInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetComponentInfo *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetContext *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
+  );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
 
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMEC.i"
+#include "CONV_FRAMEC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
-#endif /* TAO_CONV_FRAMEC_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index ca01549ce64..bb3d8ef82c6 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -1,60 +1,93 @@
+// -*- C++ -*-
+//
 // $Id$
 
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class CONV_FRAME::CodeSetComponent_var
 // *************************************************************
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void) // default constructor
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CONV_FRAME::CodeSetComponent *p)
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CodeSetComponent *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const CONV_FRAME::CodeSetComponent_var &p) // copy constructor
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const ::CONV_FRAME::CodeSetComponent_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponent(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponent (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void) // destructor
+CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CONV_FRAME::CodeSetComponent *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_var &
+CONV_FRAME::CodeSetComponent_var::operator= (CodeSetComponent *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetComponent_var &
+CONV_FRAME::CodeSetComponent_var::operator= (const ::CONV_FRAME::CodeSetComponent_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          CONV_FRAME::CodeSetComponent *deep_copy = 
-                new CONV_FRAME::CodeSetComponent (*p.ptr_);
+          CodeSetComponent *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetComponent (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetComponent *tmp = deep_copy;
+              CodeSetComponent *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -65,50 +98,57 @@ CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent *
+ACE_INLINE const ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator const CONV_FRAME::CodeSetComponent &() const // cast
+CONV_FRAME::CodeSetComponent_var::operator const ::CONV_FRAME::CodeSetComponent &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() // cast
+CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() const// cast
+CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent &
+// Variable-size types only.
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CONV_FRAME::CodeSetComponent &
 CONV_FRAME::CodeSetComponent_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent &
+ACE_INLINE ::CONV_FRAME::CodeSetComponent &
 CONV_FRAME::CodeSetComponent_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
+// Mapping for variable size.
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
 CONV_FRAME::CodeSetComponent_var::out (void)
 {
   delete this->ptr_;
@@ -116,33 +156,36 @@ CONV_FRAME::CodeSetComponent_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::_retn (void)
 {
-  CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
+  ::CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class CONV_FRAME::CodeSetComponent_out
 // *************************************************************
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent *&p)
+CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (::CONV_FRAME::CodeSetComponent *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent_var &p) // constructor from _var
+CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CodeSetComponent_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -150,472 +193,325 @@ CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetCompo
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const CONV_FRAME::CodeSetComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_)
+CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const ::CONV_FRAME::CodeSetComponent_out &p)
+  : ptr_ (ACE_const_cast (CodeSetComponent_out&, p).ptr_)
 {}
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (const CONV_FRAME::CodeSetComponent_out &p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_out &
+CONV_FRAME::CodeSetComponent_out::operator= (const ::CONV_FRAME::CodeSetComponent_out &p)
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CodeSetComponent_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CONV_FRAME::CodeSetComponent *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_out &
+CONV_FRAME::CodeSetComponent_out::operator= (CodeSetComponent *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::operator CONV_FRAME::CodeSetComponent *&() // cast
+ACE_INLINE 
+CONV_FRAME::CodeSetComponent_out::operator ::CONV_FRAME::CodeSetComponent *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
 CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA::ULong *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
-    return retval;
-  }
-
-  ACE_INLINE void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Default constructor.
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
-
-  ACE_INLINE CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-        this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    return *this;
-  }
-
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-
-  ACE_INLINE const CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-
-  ACE_INLINE const CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-
-  ACE_INLINE void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-// *************************************************************
-
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (void) // default constructor
-  : ptr_ (0)
-{}
+CORBA::ULong *
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
+{
+  CORBA::ULong *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
+  return retval;
+}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-  : ptr_ (p)
-{}
+void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
+{
+  delete [] buffer;
+}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // copy constructor
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
 {
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId(*p.ptr_));
-  else
-    this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::~_tao_seq_CodeSetId_var (void) // destructor
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
 {
-  delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // deep copy
+ACE_INLINE
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
+    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
 {
-  if (this != &p)
+  if (rhs.buffer_ != 0)
     {
-      if (p.ptr_ == 0)
+      CORBA::ULong *tmp1 =
+        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
+      CORBA::ULong * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          delete this->ptr_;
-          this->ptr_ = 0;
+          tmp1[i] = tmp2[i];
         }
-      else
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (
+    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
         {
-          CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *deep_copy = 
-            new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_);
+          // Free the old buffer.
+          CORBA::ULong *tmp =
+            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
           
-          if (deep_copy != 0)
-            {
-              CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = 
-                deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
+          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
         }
     }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ULong *tmp1 =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  CORBA::ULong * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const // cast
-{
-  return *this->ptr_;
-}
-
+// = Accessors.
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() // cast
+CORBA::ULong &
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
 {
-  return *this->ptr_;
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong* tmp =
+    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+  return tmp[i];
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::inout (void)
+const CORBA::ULong &
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
 {
-  return *this->ptr_;
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong * const tmp =
+    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out
-// *************************************************************
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&p)
-  : ptr_ (p)
+CORBA::ULong *
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
 {
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
+  CORBA::ULong *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p)
+const CORBA::ULong *
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  this->ptr_ = p;
-  return *this;
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator-> (void)
+void
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
 {
-  return this->ptr_;
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ULong *tmp =
+        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+#endif /* end #if !defined */
 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#endif /* end #if !defined */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CONV_FRAME::CodeSetComponentInfo_var
 // *************************************************************
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void) // default constructor
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CONV_FRAME::CodeSetComponentInfo *p)
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CodeSetComponentInfo *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const CONV_FRAME::CodeSetComponentInfo_var &p) // copy constructor
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const ::CONV_FRAME::CodeSetComponentInfo_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponentInfo(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponentInfo (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void) // destructor
+CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CONV_FRAME::CodeSetComponentInfo *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_var &
+CONV_FRAME::CodeSetComponentInfo_var::operator= (CodeSetComponentInfo *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetComponentInfo_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetComponentInfo_var &
+CONV_FRAME::CodeSetComponentInfo_var::operator= (const ::CONV_FRAME::CodeSetComponentInfo_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          CONV_FRAME::CodeSetComponentInfo *deep_copy = 
-            new CONV_FRAME::CodeSetComponentInfo (*p.ptr_);
+          CodeSetComponentInfo *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetComponentInfo (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetComponentInfo *tmp = deep_copy;
+              CodeSetComponentInfo *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -626,50 +522,57 @@ CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetCompon
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator const CONV_FRAME::CodeSetComponentInfo &() const // cast
+CONV_FRAME::CodeSetComponentInfo_var::operator const ::CONV_FRAME::CodeSetComponentInfo &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() // cast
+CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() const// cast
+CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo &
+// Variable-size types only.
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo &
 CONV_FRAME::CodeSetComponentInfo_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo &
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo &
 CONV_FRAME::CodeSetComponentInfo_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
+// Mapping for variable size.
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
 CONV_FRAME::CodeSetComponentInfo_var::out (void)
 {
   delete this->ptr_;
@@ -677,33 +580,36 @@ CONV_FRAME::CodeSetComponentInfo_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
 {
-  CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
+  ::CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class CONV_FRAME::CodeSetComponentInfo_out
 // *************************************************************
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo *&p)
+CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (::CONV_FRAME::CodeSetComponentInfo *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo_var &p) // constructor from _var
+CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CodeSetComponentInfo_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -711,97 +617,119 @@ CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::Code
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const CONV_FRAME::CodeSetComponentInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_)
+CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
+  : ptr_ (ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_)
 {}
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (const CONV_FRAME::CodeSetComponentInfo_out &p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_out &
+CONV_FRAME::CodeSetComponentInfo_out::operator= (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CONV_FRAME::CodeSetComponentInfo *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_out &
+CONV_FRAME::CodeSetComponentInfo_out::operator= (CodeSetComponentInfo *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::operator CONV_FRAME::CodeSetComponentInfo *&() // cast
+ACE_INLINE 
+CONV_FRAME::CodeSetComponentInfo_out::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
 CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class CONV_FRAME::CodeSetContext_var
 // *************************************************************
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void) // default constructor
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CONV_FRAME::CodeSetContext *p)
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CodeSetContext *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const CONV_FRAME::CodeSetContext_var &p) // copy constructor
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetContext(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
+// Fixed-size types only.
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void) // destructor
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext &p)
+{
+  ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (p));
+}
+
+ACE_INLINE
+CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (CONV_FRAME::CodeSetContext *p)
+ACE_INLINE
+CONV_FRAME::CodeSetContext_var &
+CONV_FRAME::CodeSetContext_var::operator= (CodeSetContext *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetContext_var &
+CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          CONV_FRAME::CodeSetContext *deep_copy = 
-            new CONV_FRAME::CodeSetContext (*p.ptr_);
+          CodeSetContext *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetContext (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetContext *tmp = deep_copy;
+              CodeSetContext *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -812,144 +740,222 @@ CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetContext *
+// fixed-size types only
+ACE_INLINE CONV_FRAME::CodeSetContext_var &
+CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext &p)
+{
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::CONV_FRAME::CodeSetContext (p),
+        *this
+      );
+  }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CONV_FRAME::CodeSetContext *
 CONV_FRAME::CodeSetContext_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext *
+ACE_INLINE ::CONV_FRAME::CodeSetContext *
 CONV_FRAME::CodeSetContext_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator const CONV_FRAME::CodeSetContext &() const // cast
+CONV_FRAME::CodeSetContext_var::operator const ::CONV_FRAME::CodeSetContext &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() // cast
+CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() const// cast
+CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetContext &
+ACE_INLINE const ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext &
+ACE_INLINE ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for fixed size
-ACE_INLINE CONV_FRAME::CodeSetContext &
+// mapping for fixed size 
+ACE_INLINE ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::out (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext
+ACE_INLINE ::CONV_FRAME::CodeSetContext
 CONV_FRAME::CodeSetContext_var::_retn (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext *
+ACE_INLINE ::CONV_FRAME::CodeSetContext *
 CONV_FRAME::CodeSetContext_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_
+
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponent &_tao_aggregate)
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.native_code_set) &&
     (strm << _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponent &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.native_code_set) &&
     (strm >> _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.ForCharData) &&
     (strm << _tao_aggregate.ForWcharData)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.ForCharData) &&
     (strm >> _tao_aggregate.ForWcharData)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetContext &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.char_data) &&
     (strm << _tao_aggregate.wchar_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetContext &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.char_data) &&
     (strm >> _tao_aggregate.wchar_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
+
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index ff7c6807510..75f822ac8f5 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -27,7 +27,7 @@
 //   command used for this is:
 //
 //     tao_idl.exe
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -63,4 +63,4 @@ module CORBA
   local interface Current {};
 };
 
-#pragma prefix ""
+
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 80e915709ed..5811dfa0510 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -19,18 +19,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/CurrentC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "CurrentC.h"
 #include "tao/Sequence_T.h"
+#include "tao/Any_T.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/CurrentC.i"
+#include "CurrentC.i"
 #endif /* !defined INLINE */
 
-int CORBA_Current::_tao_class_id = 0;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::Current::_tao_class_id = 0;
 
 CORBA::Current_ptr
 tao_CORBA_Current_duplicate (
@@ -48,21 +56,21 @@ tao_CORBA_Current_release (
   CORBA::release (p);
 }
 
-CORBA_Current_ptr
+CORBA::Current_ptr
 tao_CORBA_Current_nil (
     void
   )
 {
-  return CORBA_Current::_nil ();
+  return CORBA::Current::_nil ();
 }
 
-CORBA_Current_ptr
+CORBA::Current_ptr
 tao_CORBA_Current_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -70,264 +78,406 @@ tao_CORBA_Current_upcast (
     void *src
   )
 {
-  CORBA_Current **tmp =
-    ACE_static_cast (CORBA_Current **, src);
+  CORBA::Current **tmp =
+    ACE_static_cast (CORBA::Current **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Current_marshal (
+    CORBA::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
-// Operations for class CORBA_Current_var
+// CORBA::Current_var
 // *************************************************************
 
-CORBA_Current_var::CORBA_Current_var (void) // default constructor
-  : ptr_ (CORBA_Current::_nil ())
+CORBA::Current_var::Current_var (void)
+  : ptr_ (Current::_nil ())
 {}
 
-::CORBA_Current_ptr
-CORBA_Current_var::ptr (void) const
+::CORBA::Current_ptr
+CORBA::Current_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor
+CORBA::Current_var::Current_var (const ::CORBA::Current_var &p)
   : TAO_Base_var (),
-    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
+    ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-CORBA_Current_var::~CORBA_Current_var (void) // destructor
+CORBA::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-CORBA_Current_var &
-CORBA_Current_var::operator= (CORBA_Current_ptr p)
+CORBA::Current_var &
+CORBA::Current_var::operator= (Current_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-CORBA_Current_var &
-CORBA_Current_var::operator= (const ::CORBA_Current_var &p)
+CORBA::Current_var &
+CORBA::Current_var::operator= (const ::CORBA::Current_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
+CORBA::Current_var::operator const ::CORBA::Current_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast
+CORBA::Current_var::operator ::CORBA::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::operator-> (void) const
+::CORBA::Current_ptr
+CORBA::Current_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::in (void) const
+::CORBA::Current_ptr
+CORBA::Current_var::in (void) const
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr &
-CORBA_Current_var::inout (void)
+::CORBA::Current_ptr &
+CORBA::Current_var::inout (void)
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr &
-CORBA_Current_var::out (void)
+::CORBA::Current_ptr &
+CORBA::Current_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Current::_nil ();
+  this->ptr_ = ::CORBA::Current::_nil ();
   return this->ptr_;
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::_retn (void)
+::CORBA::Current_ptr
+CORBA::Current_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::CORBA_Current_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Current::_nil ();
+  ::CORBA::Current_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::Current::_nil ();
   return val;
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::tao_duplicate (CORBA_Current_ptr p)
+::CORBA::Current_ptr
+CORBA::Current_var::tao_duplicate (Current_ptr p)
 {
-  return ::CORBA_Current::_duplicate (p);
+  return ::CORBA::Current::_duplicate (p);
 }
 
 void
-CORBA_Current_var::tao_release (CORBA_Current_ptr p)
+CORBA::Current_var::tao_release (Current_ptr p)
 {
   CORBA::release (p);
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::tao_nil (void)
+::CORBA::Current_ptr
+CORBA::Current_var::tao_nil (void)
 {
-  return ::CORBA_Current::_nil ();
+  return ::CORBA::Current::_nil ();
 }
 
-::CORBA_Current_ptr
-CORBA_Current_var::tao_narrow (
+::CORBA::Current_ptr
+CORBA::Current_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA_Current_var::tao_upcast (void *src)
+CORBA::Current_var::tao_upcast (void *src)
 {
-  CORBA_Current **tmp =
-    ACE_static_cast (CORBA_Current **, src);
+  Current **tmp =
+    ACE_static_cast (Current **, src);
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
-// Operations for class CORBA_Current_out
+// CORBA::Current_out
 // *************************************************************
 
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
+CORBA::Current_out::Current_out (Current_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::CORBA_Current::_nil ();
+  this->ptr_ = ::CORBA::Current::_nil ();
 }
 
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
+CORBA::Current_out::Current_out (Current_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Current::_nil ();
+  this->ptr_ = ::CORBA::Current::_nil ();
 }
 
-CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_)
+CORBA::Current_out::Current_out (const ::CORBA::Current_out &p)
+  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
-::CORBA_Current_out &
-CORBA_Current_out::operator= (const ::CORBA_Current_out &p)
+::CORBA::Current_out &
+CORBA::Current_out::operator= (const ::CORBA::Current_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
   return *this;
 }
 
-CORBA_Current_out &
-CORBA_Current_out::operator= (const ::CORBA_Current_var &p)
+CORBA::Current_out &
+CORBA::Current_out::operator= (const ::CORBA::Current_var &p)
 {
-  this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
   return *this;
 }
 
-CORBA_Current_out &
-CORBA_Current_out::operator= (CORBA_Current_ptr p)
+CORBA::Current_out &
+CORBA::Current_out::operator= (Current_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast
+CORBA::Current_out::operator ::CORBA::Current_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr &
-CORBA_Current_out::ptr (void) // ptr
+::CORBA::Current_ptr &
+CORBA::Current_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::CORBA_Current_ptr
-CORBA_Current_out::operator-> (void)
+::CORBA::Current_ptr
+CORBA::Current_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
-// default constructor
-CORBA_Current::CORBA_Current (void)
+CORBA::Current::Current (void)
 {}
 
-  // destructor
-  CORBA_Current::~CORBA_Current (void)
-  {}
+CORBA::Current::~Current (void)
+{}
 
-  CORBA_Current_ptr CORBA_Current::_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-  {
-    return CORBA_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-  }
+void 
+CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
 
-  CORBA_Current_ptr CORBA_Current::_unchecked_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
-  {
-    if (CORBA::is_nil (obj))
-      return CORBA_Current::_nil ();
-    return
-        ACE_reinterpret_cast
-          (
-            CORBA_Current_ptr,
-              obj->_tao_QueryInterface
-                (
-                  ACE_reinterpret_cast
-                    (
-                      ptr_arith_t,
-                      &CORBA_Current::_tao_class_id
-                    )
+CORBA::Current_ptr
+CORBA::Current::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Current_ptr 
+CORBA::Current::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Current::_nil ();
+    }
+  
+  return
+      ACE_reinterpret_cast (
+          Current_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
                 )
-          );
+            )
+        );
 }
 
-CORBA_Current_ptr
-CORBA_Current::_duplicate (CORBA_Current_ptr obj)
+CORBA::Current_ptr
+CORBA::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-void *CORBA_Current::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &CORBA_Current::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Current)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
-const char* CORBA_Current::_interface_repository_id (void) const
+const char* CORBA::Current::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Current:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4375), 
+  ACE_NTOHL (0x7272656e), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_Current),
+    (char *) &_oc_CORBA_Current,
+    0,
+    sizeof (CORBA::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_CORBA_Current
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Current_ptr _tao_elem
+  )
+{
+  CORBA::Current_ptr _tao_objptr =
+    CORBA::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Current>::insert (
+      _tao_any,
+      CORBA::Current::_tao_any_destructor,
+      CORBA::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Current>::extract (
+        _tao_any,
+        CORBA::Current::_tao_any_destructor,
+        CORBA::_tc_Current,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA_Current,CORBA_Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA_Current,CORBA_Current_var>
+  template class TAO_Object_Manager<CORBA::Current,CORBA::Current_var>;
+  template class TAO::Any_Impl_T<CORBA::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::Current, CORBA::Current_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index be2ac03a544..a6ecde271ac 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_CURRENTC_H_
-#define _TAO_IDL_CORBA_CURRENTC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_CURRENTC_H_
+#define _TAO_IDL_ORIG_CURRENTC_H_
 
 #include "ace/pre.h"
 #include "tao/Object.h"
@@ -29,6 +32,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #include "tao/corbafwd.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -54,144 +58,181 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_CURRENT___PTR_CH_)
 #define _CORBA_CURRENT___PTR_CH_
-
-class CORBA_Current;
-typedef CORBA_Current *CORBA_Current_ptr;
+  
+  class Current;
+  typedef Current *Current_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_CURRENT___VAR_CH_)
 #define _CORBA_CURRENT___VAR_CH_
-
-class TAO_Export CORBA_Current_var : public TAO_Base_var
-{
-public:
-  CORBA_Current_var (void); // default constructor
-  CORBA_Current_var (CORBA_Current_ptr p) : ptr_ (p) {}
-  CORBA_Current_var (const CORBA_Current_var &); // copy constructor
-  ~CORBA_Current_var (void); // destructor
-
-  CORBA_Current_var &operator= (CORBA_Current_ptr);
-  CORBA_Current_var &operator= (const CORBA_Current_var &);
-  CORBA_Current_ptr operator-> (void) const;
-
-  operator const CORBA_Current_ptr &() const;
-  operator CORBA_Current_ptr &();
-  // in, inout, out, _retn
-  CORBA_Current_ptr in (void) const;
-  CORBA_Current_ptr &inout (void);
-  CORBA_Current_ptr &out (void);
-  CORBA_Current_ptr _retn (void);
-  CORBA_Current_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_Current_ptr tao_duplicate (CORBA_Current_ptr);
-  static void tao_release (CORBA_Current_ptr);
-  static CORBA_Current_ptr tao_nil (void);
-  static CORBA_Current_ptr tao_narrow (
-      CORBA::Object *
-      ACE_ENV_ARG_DECL_NOT_USED
-    );
-  static CORBA::Object * tao_upcast (void *);
-
-private:
-  CORBA_Current_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_Current_var (const TAO_Base_var &rhs);
-  CORBA_Current_var &operator= (const TAO_Base_var &rhs);
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_Export Current_var : public TAO_Base_var
+  {
+  public:
+    Current_var (void); // default constructor
+    Current_var (Current_ptr p) : ptr_ (p) {} 
+    Current_var (const Current_var &); // copy constructor
+    ~Current_var (void); // destructor
+    
+    Current_var &operator= (Current_ptr);
+    Current_var &operator= (const Current_var &);
+    Current_ptr operator-> (void) const;
+    
+    operator const Current_ptr &() const;
+    operator Current_ptr &();
+    // in, inout, out, _retn 
+    Current_ptr in (void) const;
+    Current_ptr &inout (void);
+    Current_ptr &out (void);
+    Current_ptr _retn (void);
+    Current_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Current_ptr tao_duplicate (Current_ptr);
+    static void tao_release (Current_ptr);
+    static Current_ptr tao_nil (void);
+    static Current_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    Current_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    Current_var (const TAO_Base_var &rhs);
+    Current_var &operator= (const TAO_Base_var &rhs);
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_CURRENT___OUT_CH_)
 #define _CORBA_CURRENT___OUT_CH_
-
-class TAO_Export CORBA_Current_out
-{
-public:
-  CORBA_Current_out (CORBA_Current_ptr &);
-  CORBA_Current_out (CORBA_Current_var &);
-  CORBA_Current_out (const CORBA_Current_out &);
-  CORBA_Current_out &operator= (const CORBA_Current_out &);
-  CORBA_Current_out &operator= (const CORBA_Current_var &);
-  CORBA_Current_out &operator= (CORBA_Current_ptr);
-  operator CORBA_Current_ptr &();
-  CORBA_Current_ptr &ptr (void);
-  CORBA_Current_ptr operator-> (void);
-
-private:
-  CORBA_Current_ptr &ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_Export Current_out
+  {
+  public:
+    Current_out (Current_ptr &);
+    Current_out (Current_var &);
+    Current_out (const Current_out &);
+    Current_out &operator= (const Current_out &);
+    Current_out &operator= (const Current_var &);
+    Current_out &operator= (Current_ptr);
+    operator Current_ptr &();
+    Current_ptr &ptr (void);
+    Current_ptr operator-> (void);
+  
+  private:
+    Current_ptr &ptr_;
+  };
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
+  
+  class TAO_Export Current
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef Current_ptr _ptr_type;
+    typedef Current_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static Current_ptr _duplicate (Current_ptr obj);
+    
+    static Current_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static Current_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static Current_ptr _nil (void)
+      {
+        return (Current_ptr)0;
+      }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    Current (void);
+    virtual ~Current (void);
+  
+  private:
+    Current (const Current &);
+    void operator= (const Current &);
+  };
 
-class TAO_Export CORBA_Current
-  : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_Current_ptr _ptr_type;
-  typedef CORBA_Current_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  static int _tao_class_id;
-
-  // The static operations.
-  static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
-
-  static CORBA_Current_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-  static CORBA_Current_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-  static CORBA_Current_ptr _nil (void)
-    {
-      return (CORBA_Current_ptr)0;
-    }
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  CORBA_Current (void);
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
-  virtual ~CORBA_Current (void);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
-private:
-  CORBA_Current (const CORBA_Current &);
-  void operator= (const CORBA_Current &);
-};
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-#endif /* end #if !defined */
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
-#include "tao/CurrentC.i"
+#include "CurrentC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -204,3 +245,4 @@ private:
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index 715f8a9322c..9cb6f83b66b 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -20,9 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_CURRENT___CI_)
 #define _CORBA_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index ea5489673c1..df8f168b268 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -14,7 +14,7 @@
  *   command used for this is:
  *
  *     tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -73,6 +73,4 @@ module CORBA
   typedef sequence <DomainManager> DomainManagerList;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_DOMAIN_IDL */
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 1b37e4710b5..8fa95a1c0cf 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DomainC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DomainC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -42,9 +45,8 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::DomainManager::_tao_class_id = 0;
 
@@ -91,13 +93,23 @@ tao_CORBA_DomainManager_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_DomainManager_marshal (
+    CORBA::DomainManager_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::DomainManager_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::DomainManager_var::DomainManager_var (void) // default constructor
+CORBA::DomainManager_var::DomainManager_var (void)
   : ptr_ (DomainManager::_nil ())
 {}
 
@@ -107,12 +119,12 @@ CORBA::DomainManager_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p) // copy constructor
+CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p)
   : TAO_Base_var (),
     ptr_ (DomainManager::_duplicate (p.ptr ()))
 {}
 
-CORBA::DomainManager_var::~DomainManager_var (void) // destructor
+CORBA::DomainManager_var::~DomainManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -216,10 +228,11 @@ CORBA::DomainManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::DomainManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
@@ -228,14 +241,14 @@ CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
   this->ptr_ = ::CORBA::DomainManager::_nil ();
 }
 
-CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p) // constructor from _var
+CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::DomainManager::_nil ();
 }
 
-CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p) // copy constructor
+CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p)
   : ptr_ (ACE_const_cast (DomainManager_out &, p).ptr_)
 {}
 
@@ -266,7 +279,7 @@ CORBA::DomainManager_out::operator ::CORBA::DomainManager_ptr &() // cast
 }
 
 ::CORBA::DomainManager_ptr &
-CORBA::DomainManager_out::ptr (void) // ptr
+CORBA::DomainManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -277,43 +290,53 @@ CORBA::DomainManager_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const CORBA::PolicyType & policy_type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::Policy_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+    const CORBA::PolicyType & policy_type_;
+    
+    ::CORBA::Policy_ptr _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::Policy_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
-
-  const CORBA::PolicyType & policy_type_;
-  CORBA::Policy_ptr _result;
-};
-
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    policy_type_ (policy_type)
+  TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::PolicyType & policy_type
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      policy_type_ (policy_type)
 {}
 
 Dynamic::ParameterList *
@@ -329,8 +352,7 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_
   
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= policy_type_;
+  (*parameter_list)[len].argument <<= policy_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -368,12 +390,15 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
 void 
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
@@ -386,6 +411,9 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 ::CORBA::Policy_ptr CORBA::_TAO_DomainManager_Remote_Proxy_Impl::get_domain_policy (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PolicyType policy_type
@@ -395,16 +423,14 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
     CORBA::SystemException
   ))
 {
-  
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
-
-
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_domain_policy",
@@ -430,14 +456,14 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        policy_type ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval._retn ());
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_,
+          policy_type
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -447,9 +473,9 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -461,114 +487,151 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           _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 (_tao_retval._retn ());
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
-                            (_tao_out << policy_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
+              (_tao_out << policy_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES),
-                0
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
               continue;
             }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
           if (!(
-                            (_tao_in >> _tao_retval.inout ())
+              (_tao_in >> _tao_retval.inout ())
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          ::CORBA::Policy_ptr _tao_retval_info =
+            _tao_retval._retn ();
           _tao_ri.result (_tao_retval_info);
           _tao_retval = _tao_retval_info;
           
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    PortableInterceptor::ReplyStatus _tao_status =
-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-      continue;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-return _tao_retval._retn ();
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -604,30 +667,25 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Broker::~_TAO_DomainManager_Remote_Proxy_
 
 CORBA::_TAO_DomainManager_Proxy_Impl&
 CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::DomainManager *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::CORBA::DomainManager *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::DomainManager::DomainManager (int collocated)
 {
   this->CORBA_DomainManager_setup_collocation (collocated);
 }
 
-CORBA::DomainManager::~DomainManager (void)
-{}
-
 void
 CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
 {
@@ -639,26 +697,42 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
       ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker ();
 }
 
-void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::DomainManager::~DomainManager (void)
+{}
+
+void 
+CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
-  DomainManager *tmp = ACE_static_cast (DomainManager*, _tao_void_pointer);
+  DomainManager *tmp = ACE_static_cast (DomainManager *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::DomainManager_ptr CORBA::DomainManager::_narrow (
+CORBA::DomainManager_ptr
+CORBA::DomainManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return DomainManager::_nil ();
+    {
+      return DomainManager::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/DomainManager:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (DomainManager::_nil ());
+      
       if (is_a == 0)
-        return DomainManager::_nil ();
+        {
+          return DomainManager::_nil ();
+        }
     }
+  
   return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
@@ -669,14 +743,21 @@ CORBA::DomainManager::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return DomainManager::_nil ();
+    {
+      return DomainManager::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
       DomainManager_ptr default_proxy = DomainManager::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -712,51 +793,84 @@ CORBA::DomainManager::_unchecked_narrow (
     }
   else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DomainManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DomainManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DomainManager::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::DomainManager_ptr
 CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean CORBA::DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+CORBA::DomainManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/DomainManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->CORBA_Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, DomainManager)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, DomainManager)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -765,6 +879,9 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
     CORBA::PolicyType policy_type
     ACE_ENV_ARG_DECL
@@ -779,13 +896,17 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   
   return proxy.get_domain_policy (
       this,
-      policy_type ACE_ENV_ARG_PARAMETER
+      policy_type
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -796,12 +917,12 @@ static const CORBA::Long _oc_CORBA_DomainManager[] =
   ACE_NTOHL (0x4d616e61), 
   ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-  14,
+    14,
   ACE_NTOHL (0x446f6d61), 
   ACE_NTOHL (0x696e4d61), 
   ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = DomainManager
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
     CORBA::tk_objref,
@@ -813,16 +934,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManager, &_tc_TAO_tc_CORBA_DomainManager)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_DomainManager,
+    &_tc_TAO_tc_CORBA_DomainManager
+  )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ConstructionPolicy::_tao_class_id = 0;
 
@@ -869,13 +989,23 @@ tao_CORBA_ConstructionPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ConstructionPolicy_marshal (
+    CORBA::ConstructionPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::ConstructionPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void) // default constructor
+CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void)
   : ptr_ (ConstructionPolicy::_nil ())
 {}
 
@@ -885,12 +1015,12 @@ CORBA::ConstructionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p) // copy constructor
+CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ConstructionPolicy::_duplicate (p.ptr ()))
 {}
 
-CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void) // destructor
+CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -994,10 +1124,11 @@ CORBA::ConstructionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::ConstructionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p)
@@ -1006,14 +1137,14 @@ CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p
   this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
 }
 
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p) // constructor from _var
+CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
 }
 
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p) // copy constructor
+CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p)
   : ptr_ (ACE_const_cast (ConstructionPolicy_out &, p).ptr_)
 {}
 
@@ -1044,7 +1175,7 @@ CORBA::ConstructionPolicy_out::operator ::CORBA::ConstructionPolicy_ptr &() // c
 }
 
 ::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_out::ptr (void) // ptr
+CORBA::ConstructionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1055,8 +1186,14 @@ CORBA::ConstructionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ClientRequestInfo_i
 {
 public:
@@ -1064,36 +1201,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::InterfaceDef_ptr object_type,
-      const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const CORBA::Boolean & constr_policy
+      ACE_ENV_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)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+    CORBA::InterfaceDef_ptr object_type_;
+    const CORBA::Boolean & constr_policy_;
+  };
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-
-  CORBA::InterfaceDef_ptr object_type_;
-  const CORBA::Boolean & constr_policy_;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-};
-
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    object_type_ (object_type),
-    constr_policy_ (constr_policy)
+  TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr object_type,
+      const CORBA::Boolean & constr_policy
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      object_type_ (object_type),
+      constr_policy_ (constr_policy)
 {}
 
 Dynamic::ParameterList *
@@ -1109,7 +1248,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
@@ -1119,9 +1258,11 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
       (*parameter_list)[len].argument,
       this->object_type_
     );
+
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -1153,8 +1294,13 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   return result_any;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
@@ -1167,6 +1313,9 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::_TAO_ConstructionPolicy_Remote
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA_Object *_collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
@@ -1177,15 +1326,13 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "make_domain_manager",
@@ -1216,15 +1363,15 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        object_type,
-        constr_policy ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_,
+          object_type,
+          constr_policy
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -1234,9 +1381,9 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1248,99 +1395,129 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
           if (!(
               (adapter->interfacedef_cdr_insert (_tao_out, object_type)) &&
               (_tao_out << CORBA::Any::from_boolean (constr_policy))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    PortableInterceptor::ReplyStatus _tao_status =
-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-      continue;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -1376,30 +1553,25 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_ConstructionPolicy_Rem
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl&
 CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::ConstructionPolicy *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::CORBA::ConstructionPolicy *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::ConstructionPolicy::ConstructionPolicy (int collocated)
 {
   this->CORBA_ConstructionPolicy_setup_collocation (collocated);
 }
 
-CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{}
-
 void
 CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collocated)
 {
@@ -1413,26 +1585,42 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collo
   this->CORBA_Policy_setup_collocation (collocated);
 }
 
-void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ConstructionPolicy::~ConstructionPolicy (void)
+{}
+
+void 
+CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy*, _tao_void_pointer);
+  ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
+CORBA::ConstructionPolicy_ptr
+CORBA::ConstructionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return ConstructionPolicy::_nil ();
+    {
+      return ConstructionPolicy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (ConstructionPolicy::_nil ());
+      
       if (is_a == 0)
-        return ConstructionPolicy::_nil ();
+        {
+          return ConstructionPolicy::_nil ();
+        }
     }
+  
   return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1443,14 +1631,21 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return ConstructionPolicy::_nil ();
+    {
+      return ConstructionPolicy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
       ConstructionPolicy_ptr default_proxy = ConstructionPolicy::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1486,64 +1681,102 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
     }
   else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ConstructionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ConstructionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ConstructionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+CORBA::ConstructionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->CORBA_Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1552,6 +1785,9 @@ const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void CORBA::ConstructionPolicy::make_domain_manager (
     CORBA::InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
@@ -1568,13 +1804,17 @@ void CORBA::ConstructionPolicy::make_domain_manager (
   proxy.make_domain_manager (
       this,
       object_type,
-      constr_policy ACE_ENV_ARG_PARAMETER
+      constr_policy
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1587,13 +1827,13 @@ static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
-  19,
+    19,
   ACE_NTOHL (0x436f6e73), 
   ACE_NTOHL (0x74727563), 
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
     CORBA::tk_objref,
@@ -1605,9 +1845,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConstructionPolicy, &_tc_TAO_tc_CORBA_ConstructionPolicy)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ConstructionPolicy,
+    &_tc_TAO_tc_CORBA_ConstructionPolicy
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -1622,25 +1868,27 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = CORBA::DomainManager::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-    
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::DomainManager::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1648,7 +1896,10 @@ void
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -1699,59 +1950,79 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *sr
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
 #define _CORBA_DOMAINMANAGERLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::DomainManagerList
 // *************************************************************
 
 CORBA::DomainManagerList::DomainManagerList (void)
 {}
-CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) // uses max size
+
+CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA::DomainManager_ptr *buffer, CORBA::Boolean release)
+
+CORBA::DomainManagerList::DomainManagerList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::DomainManager_ptr *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) // copy ctor
+
+CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::DomainManagerList::~DomainManagerList (void) // dtor
 {}
+
 void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManagerList *tmp = ACE_static_cast (DomainManagerList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_DomainManagerList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1763,13 +2034,13 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
   ACE_NTOHL (0x6765724c), 
   ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-  18,
+    18,
   ACE_NTOHL (0x446f6d61), 
   ACE_NTOHL (0x696e4d61), 
   ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = DomainManagerList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -1785,12 +2056,12 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
       ACE_NTOHL (0x4d616e61), 
       ACE_NTOHL (0x6765723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-      14,
+            14,
       ACE_NTOHL (0x446f6d61), 
       ACE_NTOHL (0x696e4d61), 
       ACE_NTOHL (0x6e616765), 
       ACE_NTOHL (0x72000000),  // name = DomainManager
-
+      
     0U,
 
 };
@@ -1805,210 +2076,123 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManagerList, &_tc_TAO_tc_CORBA_DomainManagerList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_DomainManagerList,
+    &_tc_TAO_tc_CORBA_DomainManagerList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManager, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA::DomainManager::_duplicate (_tao_elem),
-          CORBA::DomainManager::_tao_any_destructor
-        );
-    }
+  CORBA::DomainManager_ptr _tao_objptr =
+    CORBA::DomainManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManager, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::DomainManager::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
+      _tao_any,
+      CORBA::DomainManager::_tao_any_destructor,
+      CORBA::_tc_DomainManager,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::DomainManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_DomainManager
-          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 ()
+  return
+    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+        _tao_any,
+        CORBA::DomainManager::_tao_any_destructor,
+        CORBA::_tc_DomainManager,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_DomainManager,
-            1,
-            _tao_elem,
-            CORBA::DomainManager::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::DomainManager::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
+  template class TAO::Any_Impl_T<CORBA::DomainManager>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
+# pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstructionPolicy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA::ConstructionPolicy::_duplicate (_tao_elem),
-          CORBA::ConstructionPolicy::_tao_any_destructor
-        );
-    }
+  CORBA::ConstructionPolicy_ptr _tao_objptr =
+    CORBA::ConstructionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstructionPolicy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ConstructionPolicy::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert (
+      _tao_any,
+      CORBA::ConstructionPolicy::_tao_any_destructor,
+      CORBA::_tc_ConstructionPolicy,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ConstructionPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_ConstructionPolicy
-          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 ()
+  return
+    TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract (
+        _tao_any,
+        CORBA::ConstructionPolicy::_tao_any_destructor,
+        CORBA::_tc_ConstructionPolicy,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ConstructionPolicy,
-            1,
-            _tao_elem,
-            CORBA::ConstructionPolicy::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ConstructionPolicy::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>;
+  template class TAO::Any_Impl_T<CORBA::ConstructionPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy, CORBA::ConstructionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ConstructionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -2016,16 +2200,12 @@ void operator<<= (
     const CORBA::DomainManagerList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManagerList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
+      _tao_any,
+      CORBA::DomainManagerList::_tao_any_destructor,
+      CORBA::_tc_DomainManagerList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -2034,19 +2214,12 @@ void operator<<= (
     CORBA::DomainManagerList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManagerList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::DomainManagerList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
+      _tao_any,
+      CORBA::DomainManagerList::_tao_any_destructor,
+      CORBA::_tc_DomainManagerList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -2055,8 +2228,8 @@ CORBA::Boolean operator>>= (
     CORBA::DomainManagerList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::DomainManagerList*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::DomainManagerList *&,
       _tao_elem
     );
 }
@@ -2067,73 +2240,18 @@ CORBA::Boolean operator>>= (
     const CORBA::DomainManagerList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_DomainManagerList
-          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::DomainManagerList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::DomainManagerList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::DomainManagerList,
-            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_DomainManagerList,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::DomainManagerList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
+        _tao_any,
+        CORBA::DomainManagerList::_tao_any_destructor,
+        CORBA::_tc_DomainManagerList,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::DomainManager_ptr _tao_objref
@@ -2151,9 +2269,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       CORBA::DomainManager::_unchecked_narrow (
           obj.in ()
@@ -2170,6 +2292,9 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::ConstructionPolicy_ptr _tao_objref
@@ -2187,9 +2312,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       CORBA::ConstructionPolicy::_unchecked_narrow (
           obj.in ()
@@ -2206,22 +2335,31 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::DomainManagerList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            _tao_sequence[i].in ()->marshal (strm);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -2230,26 +2368,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4050cb9241b..46536f0de80 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINC_H_
-#define _TAO_IDL_DOMAINC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_DOMAINC_H_
+#define _TAO_IDL_ORIG_DOMAINC_H_
 
 #include "ace/pre.h"
 #include "tao/corba.h"
@@ -29,9 +32,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
 #include "PolicyC.h"
-#include "Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -56,21 +57,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
 #define _CORBA_DOMAINMANAGER___PTR_CH_
   
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DOMAINMANAGER___VAR_CH_)
 #define _CORBA_DOMAINMANAGER___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export DomainManager_var : public TAO_Base_var
   {
   public:
@@ -110,13 +119,14 @@ TAO_NAMESPACE  CORBA
     DomainManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DOMAINMANAGER___OUT_CH_)
 #define _CORBA_DOMAINMANAGER___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export DomainManager_out
   {
   public:
@@ -133,35 +143,26 @@ TAO_NAMESPACE  CORBA
   private:
     DomainManager_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::DomainManager
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
   
-  // Forward Classes Declaration.
   class _TAO_DomainManager_Proxy_Impl;
   class _TAO_DomainManager_Remote_Proxy_Impl;
   class _TAO_DomainManager_Proxy_Broker;
   class _TAO_DomainManager_Remote_Proxy_Broker;
   
   class TAO_Export DomainManager
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -182,7 +183,10 @@ TAO_NAMESPACE  CORBA
         return (DomainManager_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
@@ -192,23 +196,26 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_DomainManager_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-    
+  
   protected:
     DomainManager (int collocated = 0);
     
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (int collocated);
     
     DomainManager (
@@ -216,12 +223,11 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
+    virtual ~DomainManager (void);
     
     friend class _TAO_DomainManager_Remote_Proxy_Impl;
     friend class _TAO_DomainManager_ThruPOA_Proxy_Impl;
     friend class _TAO_DomainManager_Direct_Proxy_Impl;
-    
-    virtual ~DomainManager (void);
   
   private:
     DomainManager (const DomainManager &);
@@ -229,19 +235,26 @@ TAO_NAMESPACE  CORBA
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
   
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_Export _TAO_DomainManager_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
-    virtual ~_TAO_DomainManager_Proxy_Impl (void) { }
+    virtual ~_TAO_DomainManager_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA_Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -250,8 +263,7 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_DomainManager_Proxy_Impl (void);
   };
@@ -265,6 +277,9 @@ TAO_NAMESPACE  CORBA
   //                Remote Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Impl
     : public virtual _TAO_DomainManager_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
@@ -272,7 +287,11 @@ TAO_NAMESPACE  CORBA
   public:
     _TAO_DomainManager_Remote_Proxy_Impl (void);
     
-    virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) { }
+    virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA_Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -281,8 +300,6 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -294,12 +311,14 @@ TAO_NAMESPACE  CORBA
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_Export _TAO_DomainManager_Proxy_Broker
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_Export _TAO_DomainManager_Proxy_Broker
   {
   public:
     virtual ~_TAO_DomainManager_Proxy_Broker (void);
@@ -322,6 +341,9 @@ TAO_NAMESPACE  CORBA
   //                 Remote Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Broker
     : public virtual _TAO_DomainManager_Proxy_Broker
   {
@@ -348,27 +370,36 @@ TAO_NAMESPACE  CORBA
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManager;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::ULong SecConstruction = 11U;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_
   
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ConstructionPolicy_var : public TAO_Base_var
   {
   public:
@@ -408,13 +439,14 @@ TAO_NAMESPACE  CORBA
     ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ConstructionPolicy_out
   {
   public:
@@ -431,21 +463,15 @@ TAO_NAMESPACE  CORBA
   private:
     ConstructionPolicy_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::ConstructionPolicy
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
   
-  // Forward Classes Declaration.
   class _TAO_ConstructionPolicy_Proxy_Impl;
   class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
   class _TAO_ConstructionPolicy_Proxy_Broker;
@@ -455,11 +481,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ConstructionPolicy_ptr _ptr_type;
     typedef ConstructionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -480,7 +503,10 @@ TAO_NAMESPACE  CORBA
         return (ConstructionPolicy_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
@@ -491,23 +517,26 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ConstructionPolicy_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-    
+  
   protected:
     ConstructionPolicy (int collocated = 0);
     
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void CORBA_ConstructionPolicy_setup_collocation (int collocated);
     
     ConstructionPolicy (
@@ -515,12 +544,11 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
+    virtual ~ConstructionPolicy (void);
     
     friend class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
-    
-    virtual ~ConstructionPolicy (void);
   
   private:
     ConstructionPolicy (const ConstructionPolicy &);
@@ -528,19 +556,26 @@ TAO_NAMESPACE  CORBA
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
   
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_Export _TAO_ConstructionPolicy_Proxy_Impl
     : public virtual CORBA::_TAO_Policy_Proxy_Impl
   {
   public:
-    virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) { }
+    virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void make_domain_manager (
         CORBA_Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -550,8 +585,7 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_ConstructionPolicy_Proxy_Impl (void);
   };
@@ -565,6 +599,9 @@ TAO_NAMESPACE  CORBA
   //                Remote Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Impl
     : public virtual _TAO_ConstructionPolicy_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -573,7 +610,11 @@ TAO_NAMESPACE  CORBA
   public:
     _TAO_ConstructionPolicy_Remote_Proxy_Impl (void);
     
-    virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) { }
+    virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void make_domain_manager (
         CORBA_Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -583,8 +624,6 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -596,12 +635,14 @@ TAO_NAMESPACE  CORBA
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker
   {
   public:
     virtual ~_TAO_ConstructionPolicy_Proxy_Broker (void);
@@ -624,6 +665,9 @@ TAO_NAMESPACE  CORBA
   //                 Remote Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Broker
     : public virtual _TAO_ConstructionPolicy_Proxy_Broker
   {
@@ -650,23 +694,26 @@ TAO_NAMESPACE  CORBA
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
@@ -707,55 +754,61 @@ TAO_NAMESPACE  CORBA
       );
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
 #define _CORBA_DOMAINMANAGERLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class DomainManagerList;
   class DomainManagerList_var;
   
   // *************************************************************
-  // DomainManagerList
+  // CORBA::DomainManagerList
   // *************************************************************
   
   class TAO_Export DomainManagerList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DomainManager,DomainManager_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    DomainManagerList (void); // default ctor
-    DomainManagerList (CORBA::ULong max); // uses max size
+    DomainManagerList (void);
+    DomainManagerList (CORBA::ULong max);
     DomainManagerList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         DomainManager_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    DomainManagerList (const DomainManagerList &); // copy ctor
+    DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DomainManagerList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DOMAINMANAGERLIST___VAR_CH_)
 #define _CORBA_DOMAINMANAGERLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::DomainManagerList_var
   // *************************************************************
@@ -776,7 +829,9 @@ TAO_NAMESPACE  CORBA
     operator const DomainManagerList &() const;
     operator DomainManagerList &();
     operator DomainManagerList &() const;
-    operator DomainManagerList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator DomainManagerList *&();
     
     TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index);
     
@@ -790,14 +845,15 @@ TAO_NAMESPACE  CORBA
   private:
     DomainManagerList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DOMAINMANAGERLIST___OUT_CH_)
 #define _CORBA_DOMAINMANAGERLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export DomainManagerList_out
   {
   public:
@@ -816,18 +872,25 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const DomainManagerList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList;
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
 // Proxy Broker Factory function pointer declarations.
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
+
 extern TAO_Export
 CORBA::_TAO_DomainManager_Proxy_Broker *
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
@@ -840,26 +903,48 @@ CORBA::_TAO_ConstructionPolicy_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-// Any operators for interface CORBA::DomainManager
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &);
-// Any operators for interface CORBA::ConstructionPolicy
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DomainManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstructionPolicy_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_H_
 
@@ -874,9 +959,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DomainC.i"
@@ -892,3 +981,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 1bd874d2b4d..0ea31500a62 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -20,6 +20,9 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_DOMAINMANAGER___CI_)
 #define _CORBA_DOMAINMANAGER___CI_
 
@@ -34,9 +37,17 @@ CORBA::DomainManager::DomainManager (
   this->CORBA_DomainManager_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
 #define _CORBA_CONSTRUCTIONPOLICY___CI_
@@ -52,16 +63,25 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
   this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_
 
-ACE_INLINE CORBA::DomainManager **
+ACE_INLINE
+CORBA::DomainManager **
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::DomainManager **buf = 0;
@@ -76,11 +96,15 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA::DomainManager **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -96,64 +120,83 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Ob
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::DomainManager* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::DomainManager* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(
+    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::DomainManager **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-    CORBA::DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::DomainManager **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
+      CORBA::DomainManager ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs)
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::DomainManager::_nil ();
+      CORBA::DomainManager **tmp =
+        ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = CORBA::DomainManager::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::DomainManager **tmp1 = ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-  CORBA::DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::DomainManager **tmp1 =
+    ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
+  
+  CORBA::DomainManager ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -163,70 +206,78 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::DomainManager ** const tmp = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
+  CORBA::DomainManager ** const tmp =
+    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::DomainManager* *
+ACE_INLINE
+CORBA::DomainManager* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::DomainManager **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::DomainManager**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::DomainManager**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::DomainManager* *
+ACE_INLINE
+const CORBA::DomainManager* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CI_)
 #define _CORBA_DOMAINMANAGERLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::DomainManagerList_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (void) // default constructor
+CORBA::DomainManagerList_var::DomainManagerList_var (void)
   : ptr_ (0)
 {}
 
@@ -236,21 +287,26 @@ CORBA::DomainManagerList_var::DomainManagerList_var (DomainManagerList *p)
 {}
 
 ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p) // copy constructor
+CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_var::~DomainManagerList_var (void) // destructor
+CORBA::DomainManagerList_var::~DomainManagerList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManagerList_var &
+ACE_INLINE
+CORBA::DomainManagerList_var &
 CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
 {
   delete this->ptr_;
@@ -258,7 +314,8 @@ CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList_var &
+ACE_INLINE
+::CORBA::DomainManagerList_var &
 CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p)
 {
   if (this != &p)
@@ -270,8 +327,12 @@ CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p
         }
       else
         {
-          DomainManagerList *deep_copy =
-            new DomainManagerList (*p.ptr_);
+          DomainManagerList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              DomainManagerList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -286,63 +347,68 @@ CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p
   return *this;
 }
 
-ACE_INLINE const ::CORBA::DomainManagerList *
+ACE_INLINE
+const ::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator const ::CORBA::DomainManagerList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
 CORBA::DomainManagerList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::DomainManagerList &
+ACE_INLINE
+const ::CORBA::DomainManagerList &
 CORBA::DomainManagerList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList &
+ACE_INLINE
+::CORBA::DomainManagerList &
 CORBA::DomainManagerList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::DomainManagerList *&
+ACE_INLINE
+::CORBA::DomainManagerList *&
 CORBA::DomainManagerList_var::out (void)
 {
   delete this->ptr_;
@@ -350,7 +416,8 @@ CORBA::DomainManagerList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::_retn (void)
 {
   ::CORBA::DomainManagerList *tmp = this->ptr_;
@@ -358,12 +425,16 @@ CORBA::DomainManagerList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class CORBA::DomainManagerList_out
 // *************************************************************
@@ -376,7 +447,7 @@ CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList *&p)
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p) // constructor from _var
+CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -384,51 +455,58 @@ CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p) /
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p) // copy constructor
+CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p)
   : ptr_ (ACE_const_cast (DomainManagerList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::DomainManagerList_out &
+ACE_INLINE
+::CORBA::DomainManagerList_out &
 CORBA::DomainManagerList_out::operator= (const ::CORBA::DomainManagerList_out &p)
 {
   this->ptr_ = ACE_const_cast (DomainManagerList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList_out &
+ACE_INLINE
+::CORBA::DomainManagerList_out &
 CORBA::DomainManagerList_out::operator= (DomainManagerList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_out::operator ::CORBA::DomainManagerList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *&
+ACE_INLINE
+::CORBA::DomainManagerList *&
 CORBA::DomainManagerList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
 CORBA::DomainManagerList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::DomainManager_ptr
@@ -439,6 +517,9 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::DomainManager_ptr &
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::ConstructionPolicy_ptr
@@ -449,6 +530,8 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::ConstructionPolicy_ptr &
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_I_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_I_
@@ -457,6 +540,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::DomainManagerList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::DomainManagerList &
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
index d5fa92b8ffc..a4ea129f37c 100644
--- a/TAO/tao/Dynamic.pidl
+++ b/TAO/tao/Dynamic.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -30,6 +30,7 @@
 
 
 #include "orb.idl"
+#include <StringSeq.pidl>
 
 #ifndef _DYNAMIC_IDL_
 #define _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index a39c3630b11..ac87a5d034f 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -19,12 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DynamicC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DynamicC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/StringSeqC.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -32,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -40,34 +44,39 @@
 #include "DynamicC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-  10,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
+    10,
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
-  9,
+    9,
   ACE_NTOHL (0x61726775), 
   ACE_NTOHL (0x6d656e74), 
   ACE_NTOHL (0x0),  // name = argument
-  CORBA::tk_any,
+    CORBA::tk_any,
 
   5,
   ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   116, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+TAO_ENCAP_BYTE_ORDER, // byte order
     36,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
@@ -96,7 +105,7 @@ static const CORBA::Long _oc_Dynamic_Parameter[] =
     ACE_NTOHL (0x50415241), 
     ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -109,15 +118,24 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Parameter, &_tc_TAO_tc_Dynamic_Parameter)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Parameter,
+    &_tc_TAO_tc_Dynamic_Parameter
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
 {
   Parameter *tmp = ACE_static_cast (Parameter*, _tao_void_pointer);
   delete tmp;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -131,16 +149,21 @@ Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA:
   tmp = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    Dynamic::Parameter *old = ACE_reinterpret_cast (Dynamic::Parameter *,this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-    
-    if (this->release_)
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (old);
-    
-  }
+    {
+      Dynamic::Parameter *old =
+        ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -148,120 +171,145 @@ void
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  Dynamic::Parameter *tmp = ACE_reinterpret_cast (Dynamic::Parameter *,this->buffer_);
+    {
+      return;
+    }
   
+  Dynamic::Parameter *tmp =
+    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
   _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Dtor.
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CS_)
 #define _DYNAMIC_PARAMETERLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Dynamic::ParameterList
 // *************************************************************
 
 Dynamic::ParameterList::ParameterList (void)
 {}
-Dynamic::ParameterList::ParameterList (CORBA::ULong max) // uses max size
+
+Dynamic::ParameterList::ParameterList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Dynamic::ParameterList::ParameterList (CORBA::ULong max, CORBA::ULong length, Dynamic::Parameter *buffer, CORBA::Boolean release)
+
+Dynamic::ParameterList::ParameterList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Dynamic::Parameter *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Dynamic::ParameterList::ParameterList (const ParameterList &seq) // copy ctor
+
+Dynamic::ParameterList::ParameterList (const ParameterList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Dynamic::ParameterList::~ParameterList (void) // dtor
 {}
+
 void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ParameterList *tmp = ACE_static_cast (ParameterList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ParameterList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterList:1.0
-  14,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
+    14,
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = ParameterList
-  CORBA::tk_sequence, // typecode kind
-  228, // encapsulation length
+    CORBA::tk_sequence, // typecode kind
+  236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    212, // encapsulation length
+    220, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      26,
+      34,
       ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
       ACE_NTOHL (0x44796e61), 
       ACE_NTOHL (0x6d69632f), 
       ACE_NTOHL (0x50617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-      10,
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
+            10,
       ACE_NTOHL (0x50617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
-      9,
+            9,
       ACE_NTOHL (0x61726775), 
       ACE_NTOHL (0x6d656e74), 
       ACE_NTOHL (0x0),  // name = argument
-      CORBA::tk_any,
+            CORBA::tk_any,
 
       5,
       ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
+            CORBA::tk_enum, // typecode kind
       116, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
+TAO_ENCAP_BYTE_ORDER, // byte order
         36,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
@@ -290,7 +338,7 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
         ACE_NTOHL (0x50415241), 
         ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+        
 
     0U,
 
@@ -306,25 +354,34 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ParameterList, &_tc_TAO_tc_Dynamic_ParameterList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ParameterList,
+    &_tc_TAO_tc_Dynamic_ParameterList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ContextList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x6578744c), 
   ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:Dynamic/ContextList:1.0
-  12,
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
+    12,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x6578744c), 
   ACE_NTOHL (0x69737400),  // name = ContextList
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
@@ -336,11 +393,11 @@ static const CORBA::Long _oc_Dynamic_ContextList[] =
     ACE_NTOHL (0x72696e67), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
+        10,
     ACE_NTOHL (0x53747269), 
     ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_string, 
@@ -360,25 +417,34 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ContextList, &_tc_TAO_tc_Dynamic_ContextList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ContextList,
+    &_tc_TAO_tc_Dynamic_ContextList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_TypeCode[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  25,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-  9,
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
+    9,
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x0),  // name = TypeCode
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
 };
 
@@ -392,9 +458,15 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_TypeCode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TypeCode, &_tc_TAO_tc_Dynamic_TypeCode)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TypeCode,
+    &_tc_TAO_tc_Dynamic_TypeCode
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -409,25 +481,27 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer
   tmp = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::TypeCode **old = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-    
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::TypeCode **old = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -435,7 +509,10 @@ void
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -466,94 +543,119 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_shrink_buffer (C
 }
 
 
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
 #define _DYNAMIC_EXCEPTIONLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Dynamic::ExceptionList
 // *************************************************************
 
 Dynamic::ExceptionList::ExceptionList (void)
 {}
-Dynamic::ExceptionList::ExceptionList (CORBA::ULong max) // uses max size
+
+Dynamic::ExceptionList::ExceptionList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Dynamic::ExceptionList::ExceptionList (CORBA::ULong max, CORBA::ULong length, CORBA::TypeCode_ptr *buffer, CORBA::Boolean release)
+
+Dynamic::ExceptionList::ExceptionList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::TypeCode_ptr *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq) // copy ctor
+
+Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Dynamic::ExceptionList::~ExceptionList (void) // dtor
 {}
+
 void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionList *tmp = ACE_static_cast (ExceptionList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ExceptionList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ExceptionList:1.0
-  14,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
+    14,
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ExceptionList
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
+    CORBA::tk_sequence, // typecode kind
+  80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
+    64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      25,
+      33,
       ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
       ACE_NTOHL (0x44796e61), 
       ACE_NTOHL (0x6d69632f), 
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x436f6465), 
       ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-      9,
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
+            9,
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x436f6465), 
       ACE_NTOHL (0x0),  // name = TypeCode
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
 
     0U,
@@ -570,27 +672,36 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ExceptionList, &_tc_TAO_tc_Dynamic_ExceptionList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExceptionList,
+    &_tc_TAO_tc_Dynamic_ExceptionList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_RequestContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737443), 
   ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:Dynamic/RequestContext:1.0
-  15,
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
+    15,
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737443), 
   ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = RequestContext
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
@@ -602,11 +713,11 @@ static const CORBA::Long _oc_Dynamic_RequestContext[] =
     ACE_NTOHL (0x72696e67), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
+        10,
     ACE_NTOHL (0x53747269), 
     ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_string, 
@@ -626,12 +737,15 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_RequestContext, &_tc_TAO_tc_Dynamic_RequestContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestContext,
+    &_tc_TAO_tc_Dynamic_RequestContext
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -639,16 +753,12 @@ void operator<<= (
     const Dynamic::Parameter &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_Parameter,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert_copy (
+      _tao_any,
+      Dynamic::Parameter::_tao_any_destructor,
+      Dynamic::_tc_Parameter,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -657,19 +767,12 @@ void operator<<= (
     Dynamic::Parameter *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_Parameter,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::Parameter::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert (
+      _tao_any,
+      Dynamic::Parameter::_tao_any_destructor,
+      Dynamic::_tc_Parameter,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -690,76 +793,24 @@ CORBA::Boolean operator>>= (
     const Dynamic::Parameter *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_Parameter
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Dynamic::Parameter*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::Parameter *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::Parameter,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_Parameter,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::Parameter::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::Parameter>::extract (
+        _tao_any,
+        Dynamic::Parameter::_tao_any_destructor,
+        Dynamic::_tc_Parameter,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Dynamic::Parameter>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::Parameter>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -767,16 +818,12 @@ void operator<<= (
     const Dynamic::ParameterList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ParameterList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
+      _tao_any,
+      Dynamic::ParameterList::_tao_any_destructor,
+      Dynamic::_tc_ParameterList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -785,19 +832,12 @@ void operator<<= (
     Dynamic::ParameterList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ParameterList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::ParameterList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
+      _tao_any,
+      Dynamic::ParameterList::_tao_any_destructor,
+      Dynamic::_tc_ParameterList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -806,8 +846,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ParameterList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Dynamic::ParameterList*&,
+  return _tao_any >>= ACE_const_cast (
+      const Dynamic::ParameterList *&,
       _tao_elem
     );
 }
@@ -818,76 +858,17 @@ CORBA::Boolean operator>>= (
     const Dynamic::ParameterList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_ParameterList
-          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 Dynamic::ParameterList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::ParameterList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::ParameterList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_ParameterList,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::ParameterList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
+        _tao_any,
+        Dynamic::ParameterList::_tao_any_destructor,
+        Dynamic::_tc_ParameterList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -895,16 +876,12 @@ void operator<<= (
     const Dynamic::ExceptionList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ExceptionList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
+      _tao_any,
+      Dynamic::ExceptionList::_tao_any_destructor,
+      Dynamic::_tc_ExceptionList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -913,19 +890,12 @@ void operator<<= (
     Dynamic::ExceptionList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ExceptionList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::ExceptionList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
+      _tao_any,
+      Dynamic::ExceptionList::_tao_any_destructor,
+      Dynamic::_tc_ExceptionList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -934,8 +904,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ExceptionList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Dynamic::ExceptionList*&,
+  return _tao_any >>= ACE_const_cast (
+      const Dynamic::ExceptionList *&,
       _tao_elem
     );
 }
@@ -946,89 +916,39 @@ CORBA::Boolean operator>>= (
     const Dynamic::ExceptionList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_ExceptionList
-          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 Dynamic::ExceptionList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::ExceptionList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::ExceptionList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_ExceptionList,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::ExceptionList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
+        _tao_any,
+        Dynamic::ExceptionList::_tao_any_destructor,
+        Dynamic::_tc_ExceptionList,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Dynamic::ParameterList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1037,45 +957,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Dynamic::ExceptionList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1084,26 +1023,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 3eb653d8af6..4e384bd664a 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DYNAMICC_H_
-#define _TAO_IDL_DYNAMICC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
+#define _TAO_IDL_ORIG_DYNAMICC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,8 +32,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "StringSeqC.h"
 #include "tao/TAO_Export.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 #include "tao/Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -56,25 +60,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Dynamic
 {
-  struct Parameter;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class Parameter_var;
   
   struct TAO_Export Parameter
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Parameter_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     CORBA::Any argument;
     CORBA::ParameterMode mode;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export Parameter_var
   {
   public:
@@ -91,6 +99,7 @@ TAO_NAMESPACE  Dynamic
     operator const Parameter &() const;
     operator Parameter &();
     operator Parameter &() const;
+    
     // Variable-size types only.
     operator Parameter *&();
     
@@ -105,6 +114,9 @@ TAO_NAMESPACE  Dynamic
     Parameter *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export Parameter_out
   {
   public:
@@ -123,19 +135,23 @@ TAO_NAMESPACE  Dynamic
     void operator= (const Parameter_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
   
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_Dynamic_ParameterList
+  class TAO_Export _TAO_Unbounded_Sequence_Dynamic_ParameterList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (
@@ -172,55 +188,61 @@ TAO_NAMESPACE  Dynamic
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMIC_PARAMETERLIST_CH_)
 #define _DYNAMIC_PARAMETERLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ParameterList;
   class ParameterList_var;
   
   // *************************************************************
-  // ParameterList
+  // Dynamic::ParameterList
   // *************************************************************
   
   class TAO_Export ParameterList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ParameterList (void); // default ctor
-    ParameterList (CORBA::ULong max); // uses max size
+    ParameterList (void);
+    ParameterList (CORBA::ULong max);
     ParameterList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         Parameter *buffer, 
         CORBA::Boolean release = 0
       );
-    ParameterList (const ParameterList &); // copy ctor
+    ParameterList (const ParameterList &);
     ~ParameterList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ParameterList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMIC_PARAMETERLIST___VAR_CH_)
 #define _DYNAMIC_PARAMETERLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class Dynamic::ParameterList_var
   // *************************************************************
@@ -241,7 +263,9 @@ TAO_NAMESPACE  Dynamic
     operator const ParameterList &() const;
     operator ParameterList &();
     operator ParameterList &() const;
-    operator ParameterList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ParameterList *&();
     
     Parameter & operator[] (CORBA::ULong index);
     const Parameter & operator[] (CORBA::ULong index) const;
@@ -256,14 +280,15 @@ TAO_NAMESPACE  Dynamic
   private:
     ParameterList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMIC_PARAMETERLIST___OUT_CH_)
 #define _DYNAMIC_PARAMETERLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export ParameterList_out
   {
   public:
@@ -282,34 +307,51 @@ TAO_NAMESPACE  Dynamic
     // Assignment from T_var not allowed.
     void operator= (const ParameterList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
   typedef CORBA::StringSeq_out ContextList_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::TypeCode TypeCode;
   typedef CORBA::TypeCode_ptr TypeCode_ptr;
   typedef CORBA::TypeCode_var TypeCode_var;
   typedef CORBA::TypeCode_out TypeCode_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
@@ -342,58 +384,62 @@ TAO_NAMESPACE  Dynamic
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
 #define _DYNAMIC_EXCEPTIONLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ExceptionList;
   class ExceptionList_var;
   
   // *************************************************************
-  // ExceptionList
+  // Dynamic::ExceptionList
   // *************************************************************
   
   class TAO_Export ExceptionList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ExceptionList (void); // default ctor
-    ExceptionList (CORBA::ULong max); // uses max size
+    ExceptionList (void);
+    ExceptionList (CORBA::ULong max);
     ExceptionList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::TypeCode_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    ExceptionList (const ExceptionList &); // copy ctor
+    ExceptionList (const ExceptionList &);
     ~ExceptionList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ExceptionList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMIC_EXCEPTIONLIST___VAR_CH_)
 #define _DYNAMIC_EXCEPTIONLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class Dynamic::ExceptionList_var
   // *************************************************************
@@ -414,7 +460,9 @@ TAO_NAMESPACE  Dynamic
     operator const ExceptionList &() const;
     operator ExceptionList &();
     operator ExceptionList &() const;
-    operator ExceptionList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ExceptionList *&();
     
     TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
     
@@ -428,14 +476,15 @@ TAO_NAMESPACE  Dynamic
   private:
     ExceptionList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMIC_EXCEPTIONLIST___OUT_CH_)
 #define _DYNAMIC_EXCEPTIONLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export ExceptionList_out
   {
   public:
@@ -454,39 +503,70 @@ TAO_NAMESPACE  Dynamic
     // Assignment from T_var not allowed.
     void operator= (const ExceptionList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
   typedef CORBA::StringSeq_out RequestContext_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module Dynamic
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Parameter *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
 #define _TAO_CDR_OP_Dynamic_ParameterList_H_
 
@@ -501,6 +581,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
 #define _TAO_CDR_OP_Dynamic_ExceptionList_H_
@@ -516,9 +598,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DynamicC.i"
@@ -534,3 +620,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index 97f72630d14..323bbc4e31d 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Dynamic::Parameter_var
 // *************************************************************
 
 ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (void) // default constructor
+Dynamic::Parameter_var::Parameter_var (void)
   : ptr_ (0)
 {}
 
@@ -34,42 +38,52 @@ Dynamic::Parameter_var::Parameter_var (Parameter *p)
 {}
 
 ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p) // copy constructor
+Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::Parameter_var::~Parameter_var (void) // destructor
+Dynamic::Parameter_var::~Parameter_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (Parameter *p)
+ACE_INLINE
+Dynamic::Parameter_var &
+Dynamic::Parameter_var::operator= (Parameter *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
+ACE_INLINE
+::Dynamic::Parameter_var &
+Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          Parameter *deep_copy =
-            new Parameter (*p.ptr_);
+          Parameter *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Parameter (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -114,7 +128,7 @@ Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast 
 {
@@ -133,7 +147,7 @@ Dynamic::Parameter_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::Dynamic::Parameter *&
 Dynamic::Parameter_var::out (void)
 {
@@ -156,6 +170,9 @@ Dynamic::Parameter_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class Dynamic::Parameter_out
 // *************************************************************
@@ -168,7 +185,7 @@ Dynamic::Parameter_out::Parameter_out (::Dynamic::Parameter *&p)
 }
 
 ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (Parameter_var &p) // constructor from _var
+Dynamic::Parameter_out::Parameter_out (Parameter_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ Dynamic::Parameter_out::Parameter_out (Parameter_var &p) // constructor from _va
 }
 
 ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p) // copy constructor
+Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p)
   : ptr_ (ACE_const_cast (Parameter_out&, p).ptr_)
 {}
 
-ACE_INLINE Dynamic::Parameter_out &
+ACE_INLINE
+Dynamic::Parameter_out &
 Dynamic::Parameter_out::operator= (const ::Dynamic::Parameter_out &p)
 {
   this->ptr_ = ACE_const_cast (Parameter_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE Dynamic::Parameter_out &
-Dynamic::Parameter_out::operator= (Parameter *p)
+ACE_INLINE
+Dynamic::Parameter_out &
+Dynamic::Parameter_out::operator= (Parameter *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ Dynamic::Parameter_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_
 
-// = Static operations.
-ACE_INLINE Dynamic::Parameter *
+ACE_INLINE
+Dynamic::Parameter *
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   Dynamic::Parameter *retval = 0;
   ACE_NEW_RETURN (retval, Dynamic::Parameter[size], 0);
   return retval;
 }
 
-ACE_INLINE void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
-// Free the sequence.
+ACE_INLINE
+void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Default constructor.
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
 {
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) // Constructor using a maximum length value.
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  Dynamic::Parameter *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    Dynamic::Parameter *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs)
-// Copy constructor.
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
+    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    Dynamic::Parameter *tmp1 = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
-    Dynamic::Parameter * const tmp2 = ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      Dynamic::Parameter *tmp1 =
+        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
+      Dynamic::Parameter * const tmp2 =
+        ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs)
-// Assignment operator.
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (
+    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      Dynamic::Parameter *tmp = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          Dynamic::Parameter *tmp =
+            ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  Dynamic::Parameter *tmp1 = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-  Dynamic::Parameter * const tmp2 = ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
+  Dynamic::Parameter *tmp1 =
+    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+  Dynamic::Parameter * const tmp2 =
+    ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE Dynamic::Parameter &
+ACE_INLINE
+Dynamic::Parameter &
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter* tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+  Dynamic::Parameter* tmp =
+    ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const Dynamic::Parameter &
+ACE_INLINE
+const Dynamic::Parameter &
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter * const tmp = ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
+  Dynamic::Parameter * const tmp =
+    ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE Dynamic::Parameter *
+ACE_INLINE
+Dynamic::Parameter *
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (CORBA::Boolean orphan)
 {
   Dynamic::Parameter *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const Dynamic::Parameter *
+ACE_INLINE
+const Dynamic::Parameter *
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (CORBA::ULong max,
-CORBA::ULong length,
-Dynamic::Parameter *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Dynamic::Parameter *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    Dynamic::Parameter *tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-  }
+    {
+      Dynamic::Parameter *tmp =
+        ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
+      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CI_)
 #define _DYNAMIC_PARAMETERLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class Dynamic::ParameterList_var
 // *************************************************************
 
 ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (void) // default constructor
+Dynamic::ParameterList_var::ParameterList_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ Dynamic::ParameterList_var::ParameterList_var (ParameterList *p)
 {}
 
 ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p) // copy constructor
+Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::ParameterList_var::~ParameterList_var (void) // destructor
+Dynamic::ParameterList_var::~ParameterList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::ParameterList_var &
+ACE_INLINE
+Dynamic::ParameterList_var &
 Dynamic::ParameterList_var::operator= (ParameterList *p)
 {
   delete this->ptr_;
@@ -429,7 +492,8 @@ Dynamic::ParameterList_var::operator= (ParameterList *p)
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ParameterList_var &
+ACE_INLINE
+::Dynamic::ParameterList_var &
 Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
 {
   if (this != &p)
@@ -441,8 +505,12 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
         }
       else
         {
-          ParameterList *deep_copy =
-            new ParameterList (*p.ptr_);
+          ParameterList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ParameterList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -457,69 +525,75 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::Dynamic::ParameterList *
+ACE_INLINE
+const ::Dynamic::ParameterList *
 Dynamic::ParameterList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator const ::Dynamic::ParameterList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter &
+ACE_INLINE
+Dynamic::Parameter &
 Dynamic::ParameterList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const Dynamic::Parameter &
+ACE_INLINE
+const Dynamic::Parameter &
 Dynamic::ParameterList_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const Dynamic::Parameter &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::Dynamic::ParameterList &
+ACE_INLINE
+const ::Dynamic::ParameterList &
 Dynamic::ParameterList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList &
+ACE_INLINE
+::Dynamic::ParameterList &
 Dynamic::ParameterList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Dynamic::ParameterList *&
+ACE_INLINE
+::Dynamic::ParameterList *&
 Dynamic::ParameterList_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ Dynamic::ParameterList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_var::_retn (void)
 {
   ::Dynamic::ParameterList *tmp = this->ptr_;
@@ -535,12 +610,16 @@ Dynamic::ParameterList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class Dynamic::ParameterList_out
 // *************************************************************
@@ -553,7 +632,7 @@ Dynamic::ParameterList_out::ParameterList_out (ParameterList *&p)
 }
 
 ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p) // constructor from _var
+Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,58 +640,65 @@ Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p) // construc
 }
 
 ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p) // copy constructor
+Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p)
   : ptr_ (ACE_const_cast (ParameterList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Dynamic::ParameterList_out &
+ACE_INLINE
+::Dynamic::ParameterList_out &
 Dynamic::ParameterList_out::operator= (const ::Dynamic::ParameterList_out &p)
 {
   this->ptr_ = ACE_const_cast (ParameterList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ParameterList_out &
+ACE_INLINE
+::Dynamic::ParameterList_out &
 Dynamic::ParameterList_out::operator= (ParameterList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_out::operator ::Dynamic::ParameterList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *&
+ACE_INLINE
+::Dynamic::ParameterList *&
 Dynamic::ParameterList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter &
+ACE_INLINE
+Dynamic::Parameter &
 Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_
 
-ACE_INLINE CORBA::TypeCode **
+ACE_INLINE
+CORBA::TypeCode **
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::TypeCode **buf = 0;
@@ -627,11 +713,15 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -647,64 +737,83 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Ob
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::TypeCode* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::TypeCode* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(
+    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::TypeCode **tmp1 = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-    CORBA::TypeCode ** const tmp2 = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::TypeCode **tmp1 =
+        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
+      CORBA::TypeCode ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (
+    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
+      CORBA::TypeCode **tmp =
+        ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = CORBA::TypeCode::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::TypeCode **tmp1 = ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-  CORBA::TypeCode ** const tmp2 = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::TypeCode **tmp1 =
+    ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
+  
+  CORBA::TypeCode ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -714,70 +823,78 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (const
   return *this;
 }
 
-ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::TypeCode ** const tmp = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+  CORBA::TypeCode ** const tmp =
+    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
   return TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::TypeCode* *
+ACE_INLINE
+CORBA::TypeCode* *
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::TypeCode **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::TypeCode**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::TypeCode**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::TypeCode* *
+ACE_INLINE
+const CORBA::TypeCode* *
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CI_)
 #define _DYNAMIC_EXCEPTIONLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class Dynamic::ExceptionList_var
 // *************************************************************
 
 ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (void) // default constructor
+Dynamic::ExceptionList_var::ExceptionList_var (void)
   : ptr_ (0)
 {}
 
@@ -787,21 +904,26 @@ Dynamic::ExceptionList_var::ExceptionList_var (ExceptionList *p)
 {}
 
 ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p) // copy constructor
+Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_var::~ExceptionList_var (void) // destructor
+Dynamic::ExceptionList_var::~ExceptionList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::ExceptionList_var &
+ACE_INLINE
+Dynamic::ExceptionList_var &
 Dynamic::ExceptionList_var::operator= (ExceptionList *p)
 {
   delete this->ptr_;
@@ -809,7 +931,8 @@ Dynamic::ExceptionList_var::operator= (ExceptionList *p)
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList_var &
+ACE_INLINE
+::Dynamic::ExceptionList_var &
 Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
 {
   if (this != &p)
@@ -821,8 +944,12 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
         }
       else
         {
-          ExceptionList *deep_copy =
-            new ExceptionList (*p.ptr_);
+          ExceptionList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExceptionList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -837,63 +964,68 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::Dynamic::ExceptionList *
+ACE_INLINE
+const ::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator const ::Dynamic::ExceptionList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
 Dynamic::ExceptionList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::Dynamic::ExceptionList &
+ACE_INLINE
+const ::Dynamic::ExceptionList &
 Dynamic::ExceptionList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList &
+ACE_INLINE
+::Dynamic::ExceptionList &
 Dynamic::ExceptionList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Dynamic::ExceptionList *&
+ACE_INLINE
+::Dynamic::ExceptionList *&
 Dynamic::ExceptionList_var::out (void)
 {
   delete this->ptr_;
@@ -901,7 +1033,8 @@ Dynamic::ExceptionList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::_retn (void)
 {
   ::Dynamic::ExceptionList *tmp = this->ptr_;
@@ -909,12 +1042,16 @@ Dynamic::ExceptionList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class Dynamic::ExceptionList_out
 // *************************************************************
@@ -927,7 +1064,7 @@ Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList *&p)
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p) // constructor from _var
+Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -935,75 +1072,98 @@ Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p) // construc
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p) // copy constructor
+Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p)
   : ptr_ (ACE_const_cast (ExceptionList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Dynamic::ExceptionList_out &
+ACE_INLINE
+::Dynamic::ExceptionList_out &
 Dynamic::ExceptionList_out::operator= (const ::Dynamic::ExceptionList_out &p)
 {
   this->ptr_ = ACE_const_cast (ExceptionList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList_out &
+ACE_INLINE
+::Dynamic::ExceptionList_out &
 Dynamic::ExceptionList_out::operator= (ExceptionList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_out::operator ::Dynamic::ExceptionList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *&
+ACE_INLINE
+::Dynamic::ExceptionList *&
 Dynamic::ExceptionList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
 Dynamic::ExceptionList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Dynamic::Parameter &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const Dynamic::Parameter &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.argument) &&
     (strm << _tao_aggregate.mode)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Dynamic::Parameter &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    Dynamic::Parameter &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.argument) &&
     (strm >> _tao_aggregate.mode)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_I_
 #define _TAO_CDR_OP_Dynamic_ParameterList_I_
@@ -1012,6 +1172,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Dynamic::ParameterList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Dynamic::ParameterList &
@@ -1019,6 +1180,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_I_
 #define _TAO_CDR_OP_Dynamic_ExceptionList_I_
@@ -1027,6 +1190,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Dynamic::ExceptionList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Dynamic::ExceptionList &
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 6d4c901b8ae..83df3a4ede6 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1145,6 +1145,7 @@ CORBA_##name ::_is_a (const char* interface_id) const \
                "IDL:omg.org/CORBA/" #name ":1.0") == 0) \
           || CORBA_SystemException::_is_a (interface_id)); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1156,6 +1157,7 @@ CORBA_##name ::_downcast (CORBA_Exception* exception) \
     return ACE_dynamic_cast (CORBA_##name *, exception); \
   return 0; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1165,6 +1167,7 @@ CORBA_##name ::_raise (void) \
 { \
   TAO_RAISE (*this); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1176,6 +1179,7 @@ CORBA_##name :: CORBA_##name (void) \
                             CORBA::COMPLETED_NO) \
 { \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1185,6 +1189,7 @@ CORBA_##name ::_type (void) const \
 { \
   return CORBA::_tc_ ## name; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1195,6 +1200,7 @@ CORBA_##name ::_tao_any_destructor (void *x) \
   CORBA_##name *tmp = ACE_static_cast (CORBA_##name *, x); \
   delete tmp; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1206,177 +1212,93 @@ CORBA_##name ::_tao_duplicate (void) const \
   ACE_NEW_RETURN (result, CORBA_##name (*this), 0); \
   return result; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static void
-tao_insert_for_insertion_system_exception (CORBA::Any &any,
-                                           const CORBA::SystemException &ex,
-                                           const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      ex._tao_encode (stream ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      any._tao_replace (ex._type (),
-                        TAO_ENCAP_BYTE_ORDER,
-                        stream.begin ());
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::Boolean \
+TAO::Any_Dual_Impl_T<CORBA_##name >::demarshal_value (TAO_InputCDR &cdr) \
+{ \
+  ACE_TRY_NEW_ENV \
+    { \
+      this->value_->_tao_decode (cdr \
+                                 ACE_ENV_ARG_PARAMETER); \
+      ACE_TRY_CHECK; \
+      return 1; \
+    } \
+  ACE_CATCHANY \
+    { \
+    } \
+  ACE_ENDTRY; \
+  return 0; \
 }
 
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
 #define TAO_SYSTEM_EXCEPTION(name) \
 void operator<<= (CORBA::Any &any, const CORBA_##name &ex) \
 { \
-  tao_insert_for_insertion_system_exception (any, ex, \
-            "\tCORBA::Any insertion (non-copy) of CORBA_" #name "\n" \
-                               ); \
+  TAO::Any_Dual_Impl_T<CORBA_##name >::insert_copy ( \
+      any, \
+      CORBA_##name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static void
-tao_insert_system_exception (CORBA::Any &any,
-                             CORBA::SystemException *ex,
-                             CORBA::Any::_tao_destructor destructor,
-                             const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      ex->_tao_encode (stream ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      any._tao_replace (ex->_type (),
-                        TAO_ENCAP_BYTE_ORDER,
-                        stream.begin (),
-                        1,
-                        ex,
-                        destructor);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg
-        );
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
 #define TAO_SYSTEM_EXCEPTION(name) \
 void operator<<= (CORBA::Any &any, CORBA_##name *ex) \
 { \
-  tao_insert_system_exception (any, ex, \
-          CORBA_##name ::_tao_any_destructor, \
-          "\tCORBA::Any insertion (non-copy) of CORBA_" #name "\n" \
-                               ); \
+  TAO::Any_Dual_Impl_T<CORBA_##name >::insert ( \
+      any, \
+      CORBA_##name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
 }
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-static CORBA_SystemException* _tao_allocator_##name (void) \
+CORBA::Boolean operator>>= (const CORBA::Any &any, \
+                            const CORBA_##name *&ex) \
 { \
-  return new CORBA_##name; \
+  return \
+    TAO::Any_Dual_Impl_T<CORBA_##name >::extract ( \
+        any, \
+        CORBA_##name ::_tao_any_destructor, \
+        CORBA::_tc_ ## name, \
+        ex \
+      ); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static CORBA::Boolean
-tao_insert_in_extractor_system_exception (
-        const CORBA::Any &any,
-        CORBA::SystemException *&tmp,
-        CORBA::SystemException * (*allocator)(void),
-        CORBA::TypeCode_ptr tc_name,
-        CORBA::Any::_tao_destructor destructor,
-        const char *compare_IR_Id,
-        const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::TypeCode_var type = any.type ();
-      CORBA::Boolean equiv =
-        type->equivalent (tc_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (!equiv)
-        return 0;
-      if (any.any_owns_data ())
-        {
-          tmp = (CORBA_SystemException *)any.value ();
-          return 1;
-        }
-      else
-        {
-          TAO_InputCDR stream (
-              any._tao_get_cdr (),
-              any._tao_byte_order ()
-            );
-          CORBA::String_var interface_repository_id;
-          if (!(stream >> interface_repository_id.out ()))
-            return 0;
-          if (ACE_OS_String::strcmp (interface_repository_id.in (),
-                                     compare_IR_Id))
-            return 0;
-          CORBA::SystemException *tmp = allocator ();
-          tmp->_tao_decode (stream ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ((CORBA::Any *)&any)->_tao_replace (
-              tc_name,
-              1,
-              tmp,
-              destructor
-            );
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg
-        );
-    }
-  ACE_ENDTRY;
-  return 0;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Boolean operator>>= (const CORBA::Any &any, \
-                            const CORBA_##name *&ex) \
-{ \
-  ex = 0; \
-  CORBA_SystemException *tmp; \
-  if (tao_insert_in_extractor_system_exception (any, \
-       tmp, \
-       _tao_allocator_##name, \
-       CORBA::_tc_##name, \
-       CORBA_##name ::_tao_any_destructor, \
-       "IDL:omg.org/CORBA/" #name ":1.0", \
-       "\tCORBA::Any extraction of CORBA_" #name "\n") == 0) \
-         { \
-             ex = 0; \
-         return 0; \
-         } \
- ex = (CORBA_##name*)tmp; \
- return 1; \
-}
+template class TAO::Any_Dual_Impl_T<CORBA_##name >;
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+#pragma instantiate TAO::Any_Dual_Impl_T<CORBA_##name >
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #undef STANDARD_EXCEPTION_LIST
 
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index e9da0b786da..a09e1f2cdbc 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 73dbf1111fa..8c5c7531c78 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -1,4 +1,27 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
 // ================================================================
 //
@@ -17,81 +40,228 @@
 // ================================================================
 
 
-#include "tao/GIOPC.h"
+#include "GIOPC.h"
 #include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/Typecode.h"
+#include "tao/Any_T.h"
+#include "tao/ORB_Core.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "GIOPC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_AddressingDisposition[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x6973706f), ACE_NTOHL (0x73697469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
-  22, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e674469), ACE_NTOHL (0x73706f73), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
-  CORBA::tk_short,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x696e6744), 
+  ACE_NTOHL (0x6973706f), 
+  ACE_NTOHL (0x73697469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
+    22,
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e674469), 
+  ACE_NTOHL (0x73706f73), 
+  ACE_NTOHL (0x6974696f), 
+  ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
+    CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (CORBA::tk_alias, sizeof (_oc_GIOP_AddressingDisposition), (char *) &_oc_GIOP_AddressingDisposition, 0, sizeof (GIOP::AddressingDisposition));
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (
+    CORBA::tk_alias,
+    sizeof (_oc_GIOP_AddressingDisposition),
+    (char *) &_oc_GIOP_AddressingDisposition,
+    0,
+    sizeof (GIOP::AddressingDisposition)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AddressingDisposition, &_tc_TAO_tc_GIOP_AddressingDisposition)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, KeyAddr, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ProfileAddr, 1)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AddressingDisposition,
+    &_tc_TAO_tc_GIOP_AddressingDisposition
+  )
 TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_GIOP_Version[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f566572), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
+    8,
+  ACE_NTOHL (0x56657273), 
+  ACE_NTOHL (0x696f6e00),  // name = Version
+  2, // member count
+    6,
+  ACE_NTOHL (0x6d616a6f), 
+  ACE_NTOHL (0x72000000),  // name = major
+    CORBA::tk_octet,
+
+  6,
+  ACE_NTOHL (0x6d696e6f), 
+  ACE_NTOHL (0x72000000),  // name = minor
+    CORBA::tk_octet,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
+    CORBA::tk_struct,
+    sizeof (_oc_GIOP_Version),
+    (char *) &_oc_GIOP_Version,
+    0,
+    sizeof (GIOP::Version)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ReferenceAddr, 2)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Version,
+    &_tc_TAO_tc_GIOP_Version
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Version *tmp = ACE_static_cast (Version*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-  18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e67496e), 
+  ACE_NTOHL (0x666f3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
+    18,
+  ACE_NTOHL (0x494f5241), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67496e66), 
+  ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
   2, // member count
-  23, ACE_NTOHL (0x73656c65), ACE_NTOHL (0x63746564), ACE_NTOHL (0x5f70726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000),  // name = selected_profile_index
-  CORBA::tk_ulong,
+    23,
+  ACE_NTOHL (0x73656c65), 
+  ACE_NTOHL (0x63746564), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x5f696e64), 
+  ACE_NTOHL (0x65780000),  // name = selected_profile_index
+    CORBA::tk_ulong,
 
-  4, ACE_NTOHL (0x696f7200),  // name = ior
-  CORBA::tk_struct, // typecode kind
+  4,
+  ACE_NTOHL (0x696f7200),  // name = ior
+    CORBA::tk_struct, // typecode kind
   288, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-    4, ACE_NTOHL (0x494f5200),  // name = IOR
+    24,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x494f523a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+        4,
+    ACE_NTOHL (0x494f5200),  // name = IOR
     2, // member count
-    8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-    CORBA::tk_string,
+        8,
+    ACE_NTOHL (0x74797065), 
+    ACE_NTOHL (0x5f696400),  // name = type_id
+        CORBA::tk_string, 
     0U, // string length
-    9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-    CORBA::tk_sequence, // typecode kind
+    9,
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c6573), 
+    ACE_NTOHL (0x0),  // name = profiles
+        CORBA::tk_sequence, // typecode kind
     200, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       184, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-        14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x653a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+                14,
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x65000000),  // name = TaggedProfile
         2, // member count
-        4, ACE_NTOHL (0x74616700),  // name = tag
-        CORBA::tk_alias, // typecode kind for typedefs
+                4,
+        ACE_NTOHL (0x74616700),  // name = tag
+                CORBA::tk_alias, // typecode kind for typedefs
         60, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
-          30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-          10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-          CORBA::tk_ulong,
-
-
-        13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-        CORBA::tk_sequence, // typecode kind
+          30,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x494f502f), 
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x643a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+                    10,
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x64000000),  // name = ProfileId
+                    CORBA::tk_ulong,
+
+
+        13,
+        ACE_NTOHL (0x70726f66), 
+        ACE_NTOHL (0x696c655f), 
+        ACE_NTOHL (0x64617461), 
+        ACE_NTOHL (0x0),  // name = profile_data
+                CORBA::tk_sequence, // typecode kind
         12, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_octet,
@@ -103,51 +273,91 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (CORBA::tk_struct, sizeof (_oc_GIOP_IORAddressingInfo), (char *) &_oc_GIOP_IORAddressingInfo, 0, sizeof (GIOP::IORAddressingInfo));
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (
+    CORBA::tk_struct,
+    sizeof (_oc_GIOP_IORAddressingInfo),
+    (char *) &_oc_GIOP_IORAddressingInfo,
+    0,
+    sizeof (GIOP::IORAddressingInfo)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IORAddressingInfo, &_tc_TAO_tc_GIOP_IORAddressingInfo)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORAddressingInfo,
+    &_tc_TAO_tc_GIOP_IORAddressingInfo
+  )
 TAO_NAMESPACE_END
 
-// *************************************************************
-// Operations for union GIOP::TargetAddress
-// *************************************************************
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORAddressingInfo *tmp = ACE_static_cast (IORAddressingInfo*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:92
 
-// default constructor
 GIOP::TargetAddress::TargetAddress (void)
 {
   ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_));
   ACE_OS::memset (&this->u_, 0, sizeof (this->u_));
+  this->disc_ = 0;
 }
 
-// copy constructor
-GIOP::TargetAddress::TargetAddress (const GIOP::TargetAddress &u)
+GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
 {
   this->disc_ = u.disc_;
   switch (this->disc_)
   {
     case 0:
     {
-      ACE_NEW (
-          this->u_.object_key_,
-          TAO_ObjectKey (*u.u_.object_key_)
-        );
+      if (u.u_.object_key_ == 0)
+        {
+          this->u_.object_key_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.object_key_,
+              TAO::ObjectKey (*u.u_.object_key_)
+            );
+        }
     }
     break;
     case 1:
     {
-      ACE_NEW (
-          this->u_.profile_,
-          IOP::TaggedProfile (*u.u_.profile_)
-        );
+      if (u.u_.profile_ == 0)
+        {
+          this->u_.profile_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.profile_,
+              IOP::TaggedProfile (*u.u_.profile_)
+            );
+        }
     }
     break;
     case 2:
     {
-      ACE_NEW (
-          this->u_.ior_,
-          GIOP::IORAddressingInfo (*u.u_.ior_)
-        );
+      if (u.u_.ior_ == 0)
+        {
+          this->u_.ior_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.ior_,
+              GIOP::IORAddressingInfo (*u.u_.ior_)
+            );
+        }
     }
     break;
     default:
@@ -155,48 +365,87 @@ GIOP::TargetAddress::TargetAddress (const GIOP::TargetAddress &u)
   }
 }
 
-// assignment operator
+GIOP::TargetAddress::~TargetAddress (void)
+{
+  // Finalize.
+  this->_reset (this->disc_, 1);
+}
+
+void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TargetAddress *tmp = ACE_static_cast (TargetAddress*, _tao_void_pointer);
+  delete tmp;
+}
+
 GIOP::TargetAddress &
-GIOP::TargetAddress::operator= (const GIOP::TargetAddress &u)
+GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
 {
+  if (&u == this)
+    {
+      return *this;
+    }
+  
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
+  
   switch (this->disc_)
   {
     case 0:
     {
-      ACE_NEW_RETURN (
-          this->u_.object_key_,
-          TAO_ObjectKey (*u.u_.object_key_),
-          *this
-        );
+      if (u.u_.object_key_ == 0)
+        {
+          this->u_.object_key_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.object_key_,
+              TAO::ObjectKey (*u.u_.object_key_),
+              *this
+            );
+        }
     }
     break;
     case 1:
     {
-      ACE_NEW_RETURN (
-          this->u_.profile_,
-          IOP::TaggedProfile (*u.u_.profile_),
-          *this
-        );
+      if (u.u_.profile_ == 0)
+        {
+          this->u_.profile_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.profile_,
+              IOP::TaggedProfile (*u.u_.profile_),
+              *this
+            );
+        }
     }
     break;
     case 2:
     {
-      ACE_NEW_RETURN (
-          this->u_.ior_,
-          GIOP::IORAddressingInfo (*u.u_.ior_),
-          *this
-        );
+      if (u.u_.ior_ == 0)
+        {
+          this->u_.ior_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.ior_,
+              GIOP::IORAddressingInfo (*u.u_.ior_),
+              *this
+            );
+        }
     }
     break;
     default:
     break;
   }
-return *this;
+  
+  return *this;
 }
 
-// reset method to reset old values of a union
+// Reset method to reset old values of a union.
 void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 {
   switch (this->disc_)
@@ -218,18 +467,37 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
   }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_GIOP_TargetAddress[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f546172), ACE_NTOHL (0x67657441), ACE_NTOHL (0x64647265), ACE_NTOHL (0x73733a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
-  14, ACE_NTOHL (0x54617267), ACE_NTOHL (0x65744164), ACE_NTOHL (0x64726573), ACE_NTOHL (0x73000000),  // name = TargetAddress
-  CORBA::tk_short,
-
-  -1, // default used index
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f546172), 
+  ACE_NTOHL (0x67657441), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x73733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
+  14,
+  ACE_NTOHL (0x54617267), 
+  ACE_NTOHL (0x65744164), 
+  ACE_NTOHL (0x64726573), 
+  ACE_NTOHL (0x73000000),  // name = TargetAddress
+    CORBA::tk_short,
+
+-1, // default used index
   3, // member count
-  ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
-  11, ACE_NTOHL (0x6f626a65), ACE_NTOHL (0x63745f6b), ACE_NTOHL (0x65790000),  // name = object_key
-  CORBA::tk_sequence, // typecode kind
+    ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
+  11,
+  ACE_NTOHL (0x6f626a65), 
+  ACE_NTOHL (0x63745f6b), 
+  ACE_NTOHL (0x65790000),  // name = object_key
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -237,24 +505,55 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     0U,
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
-  8, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6500),  // name = profile
-  CORBA::tk_struct, // typecode kind
+  8,
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c6500),  // name = profile
+    CORBA::tk_struct, // typecode kind
   184, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-    14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+        14,
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x65000000),  // name = TaggedProfile
     2, // member count
-    4, ACE_NTOHL (0x74616700),  // name = tag
-    CORBA::tk_alias, // typecode kind for typedefs
+        4,
+    ACE_NTOHL (0x74616700),  // name = tag
+        CORBA::tk_alias, // typecode kind for typedefs
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-      10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-      CORBA::tk_ulong,
+      30,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x643a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+            10,
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x64000000),  // name = ProfileId
+            CORBA::tk_ulong,
 
 
-    13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-    CORBA::tk_sequence, // typecode kind
+    13,
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c655f), 
+    ACE_NTOHL (0x64617461), 
+    ACE_NTOHL (0x0),  // name = profile_data
+        CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_octet,
@@ -263,301 +562,375 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
 
 
   ACE_IDL_NSTOHL (0x0002), // union case label (evaluated value)
-  4, ACE_NTOHL (0x696f7200),  // name = ior
-  CORBA::tk_struct, // typecode kind
-  412, // encapsulation length
+  4,
+  ACE_NTOHL (0x696f7200),  // name = ior
+    CORBA::tk_struct, // typecode kind
+  228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-    18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
+    39,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x47494f50), 
+    ACE_NTOHL (0x2f494f52), 
+    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x65737369), 
+    ACE_NTOHL (0x6e67496e), 
+    ACE_NTOHL (0x666f3a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
+        18,
+    ACE_NTOHL (0x494f5241), 
+    ACE_NTOHL (0x64647265), 
+    ACE_NTOHL (0x7373696e), 
+    ACE_NTOHL (0x67496e66), 
+    ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
     2, // member count
-    23, ACE_NTOHL (0x73656c65), ACE_NTOHL (0x63746564), ACE_NTOHL (0x5f70726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000),  // name = selected_profile_index
-    CORBA::tk_ulong,
-
-    4, ACE_NTOHL (0x696f7200),  // name = ior
-    CORBA::tk_struct, // typecode kind
-    288, // encapsulation length
+        23,
+    ACE_NTOHL (0x73656c65), 
+    ACE_NTOHL (0x63746564), 
+    ACE_NTOHL (0x5f70726f), 
+    ACE_NTOHL (0x66696c65), 
+    ACE_NTOHL (0x5f696e64), 
+    ACE_NTOHL (0x65780000),  // name = selected_profile_index
+        CORBA::tk_ulong,
+
+    4,
+    ACE_NTOHL (0x696f7200),  // name = ior
+        CORBA::tk_struct, // typecode kind
+    104, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-      4, ACE_NTOHL (0x494f5200),  // name = IOR
+      24,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x494f523a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+            4,
+      ACE_NTOHL (0x494f5200),  // name = IOR
       2, // member count
-      8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-      CORBA::tk_string,
+            8,
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f696400),  // name = type_id
+            CORBA::tk_string, 
       0U, // string length
-      9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-      CORBA::tk_sequence, // typecode kind
-      200, // encapsulation length
+      9,
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c6573), 
+      ACE_NTOHL (0x0),  // name = profiles
+            CORBA::tk_sequence, // typecode kind
+      16, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_struct, // typecode kind
-        184, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-          14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-          2, // member count
-          4, ACE_NTOHL (0x74616700),  // name = tag
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-            10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-            CORBA::tk_ulong,
-
-
-          13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-          CORBA::tk_sequence, // typecode kind
-          12, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_octet,
-
-            0U,
-
-
+        0xffffffff, // indirection
+        0xfffffe50, // negative offset (-432)
         0U,
 
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (CORBA::tk_union, sizeof (_oc_GIOP_TargetAddress), (char *) &_oc_GIOP_TargetAddress, 0, sizeof (GIOP::TargetAddress));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TargetAddress, &_tc_TAO_tc_GIOP_TargetAddress)
-TAO_NAMESPACE_END
 
-static const CORBA::Long _oc_GIOP_Version[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f566572),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
-  8,
-  ACE_NTOHL (0x56657273),
-  ACE_NTOHL (0x696f6e00),  // name = Version
-  2, // member count
-  6,
-  ACE_NTOHL (0x6d616a6f),
-  ACE_NTOHL (0x72000000),  // name = major
-  CORBA::tk_octet,
-
-  6,
-  ACE_NTOHL (0x6d696e6f),
-  ACE_NTOHL (0x72000000),  // name = minor
-  CORBA::tk_octet,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
-    CORBA::tk_struct,
-    sizeof (_oc_GIOP_Version),
-    (char *) &_oc_GIOP_Version,
+static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (
+    CORBA::tk_union,
+    sizeof (_oc_GIOP_TargetAddress),
+    (char *) &_oc_GIOP_TargetAddress,
     0,
-    sizeof (GIOP::Version)
+    sizeof (GIOP::TargetAddress)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Version, &_tc_TAO_tc_GIOP_Version)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TargetAddress,
+    &_tc_TAO_tc_GIOP_TargetAddress
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
-void
-GIOP::IORAddressingInfo::_tao_any_destructor (void *x)
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const GIOP::Version &_tao_elem
+  )
 {
-  GIOP::IORAddressingInfo *tmp = ACE_static_cast (GIOP::IORAddressingInfo*,x);
-  delete tmp;
+  TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy (
+      _tao_any,
+      GIOP::Version::_tao_any_destructor,
+      GIOP::_tc_Version,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const GIOP::IORAddressingInfo &_tao_elem) // copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    GIOP::Version *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      GIOP::_tc_IORAddressingInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+  TAO::Any_Dual_Impl_T<GIOP::Version>::insert (
+      _tao_any,
+      GIOP::Version::_tao_any_destructor,
+      GIOP::_tc_Version,
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, GIOP::IORAddressingInfo *_tao_elem) // non copying
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    GIOP::Version *&_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      GIOP::_tc_IORAddressingInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      GIOP::IORAddressingInfo::_tao_any_destructor
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::Version *&,
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const GIOP::Version *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_IORAddressingInfo ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<GIOP::Version>::extract (
+        _tao_any,
+        GIOP::Version::_tao_any_destructor,
+        GIOP::_tc_Version,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::Version>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::Version>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (GIOP::IORAddressingInfo *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, GIOP::IORAddressingInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            GIOP::_tc_IORAddressingInfo,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            GIOP::IORAddressingInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const GIOP::IORAddressingInfo &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert_copy (
+      _tao_any,
+      GIOP::IORAddressingInfo::_tao_any_destructor,
+      GIOP::_tc_IORAddressingInfo,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const GIOP::IORAddressingInfo *&_tao_elem)
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    GIOP::IORAddressingInfo *_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(GIOP::IORAddressingInfo*&,_tao_elem);
+  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert (
+      _tao_any,
+      GIOP::IORAddressingInfo::_tao_any_destructor,
+      GIOP::_tc_IORAddressingInfo,
+      _tao_elem
+    );
 }
 
-void
-GIOP::TargetAddress::_tao_any_destructor (void *x)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    GIOP::IORAddressingInfo *&_tao_elem
+  )
 {
-  GIOP::TargetAddress *tmp = ACE_static_cast (GIOP::TargetAddress*,x);
-  delete tmp;
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::IORAddressingInfo *&,
+      _tao_elem
+    );
 }
 
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const GIOP::IORAddressingInfo *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract (
+        _tao_any,
+        GIOP::IORAddressingInfo::_tao_any_destructor,
+        GIOP::_tc_IORAddressingInfo,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const GIOP::TargetAddress &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          GIOP::_tc_TargetAddress,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert_copy (
+      _tao_any,
+      GIOP::TargetAddress::_tao_any_destructor,
+      GIOP::_tc_TargetAddress,
+      _tao_elem
+    );
 }
 
+// Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     GIOP::TargetAddress *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          GIOP::_tc_TargetAddress,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          GIOP::IORAddressingInfo::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert (
+      _tao_any,
+      GIOP::TargetAddress::_tao_any_destructor,
+      GIOP::_tc_TargetAddress,
+      _tao_elem
+    );
 }
 
+// Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
     GIOP::TargetAddress *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_TargetAddress ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::TargetAddress *&,
+      _tao_elem
+    );
+}
 
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const GIOP::TargetAddress *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::extract (
+        _tao_any,
+        GIOP::TargetAddress::_tao_any_destructor,
+        GIOP::_tc_TargetAddress,
+        _tao_elem
+      );
+}
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (GIOP::TargetAddress *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, GIOP::TargetAddress, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::TargetAddress>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            GIOP::_tc_TargetAddress,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            GIOP::IORAddressingInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_CPP_
+#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    TAO::ObjectKey &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        delete  _tao_elem;
-        _tao_elem = 0;
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
+      
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-  }
-  ACE_ENDTRY;
+  
   return 0;
 }
 
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::TargetAddress *&_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TAO::ObjectKey &_tao_sequence
   )
 {
-  return _tao_any >>= ACE_const_cast (GIOP::TargetAddress*&,_tao_elem);
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
+      {
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
+      }
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+    }
+  
+  return 0;
 }
+
+#endif /* _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_CPP_ */
+
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index b4a34b103fa..25fc4b2a83d 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -1,5 +1,6 @@
-/* -*- C++ -*- $Id$ */
-
+// -*- C++ -*-
+//
+// $Id$
 
 //=============================================================================
 /**
@@ -17,12 +18,22 @@
  */
 //=============================================================================
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // Readers Note:
 // This file is named GIOPC.h intentionally. Shortly the file GIOP.h
@@ -30,10 +41,13 @@
 // pluggable messaging stuff is done. So I would assume that there
 // should be no such name clashes.
 
-#ifndef _TAO_IDL_GIOPC_H_
-#define _TAO_IDL_GIOPC_H_
-#include "ace/pre.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
+#ifndef _TAO_IDL_ORIG_GIOPC_H_
+#define _TAO_IDL_ORIG_GIOPC_H_
+
+#include "ace/pre.h"
 #include "tao/corbafwd.h"
 #include "tao/IOPC.h"
 #include "tao/Object_KeyC.h"
@@ -66,61 +80,93 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  GIOP
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AddressingDisposition;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short KeyAddr;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ProfileAddr;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ReferenceAddr;
-
-
-  struct IORAddressingInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short KeyAddr = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ProfileAddr = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ReferenceAddr = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class IORAddressingInfo_var;
-
+  
   struct TAO_Export IORAddressingInfo
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORAddressingInfo_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export IORAddressingInfo_var
   {
   public:
-    IORAddressingInfo_var (void); // default constructor
+    IORAddressingInfo_var (void);
     IORAddressingInfo_var (IORAddressingInfo *);
-    IORAddressingInfo_var (const IORAddressingInfo_var &); // copy constructor
-    ~IORAddressingInfo_var (void); // destructor
-
+    IORAddressingInfo_var (const IORAddressingInfo_var &);
+    ~IORAddressingInfo_var (void);
+    
     IORAddressingInfo_var &operator= (IORAddressingInfo *);
     IORAddressingInfo_var &operator= (const IORAddressingInfo_var &);
     IORAddressingInfo *operator-> (void);
     const IORAddressingInfo *operator-> (void) const;
-
+    
     operator const IORAddressingInfo &() const;
     operator IORAddressingInfo &();
     operator IORAddressingInfo &() const;
-    // in, inout, out, _retn
+    
+    // Variable-size types only.
+    operator IORAddressingInfo *&();
+    
+    // in, inout, out, _retn 
     const IORAddressingInfo &in (void) const;
     IORAddressingInfo &inout (void);
     IORAddressingInfo *&out (void);
     IORAddressingInfo *_retn (void);
     IORAddressingInfo *ptr (void) const;
-
+  
   private:
     IORAddressingInfo *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export IORAddressingInfo_out
   {
   public:
@@ -132,189 +178,270 @@ TAO_NAMESPACE  GIOP
     operator IORAddressingInfo *&();
     IORAddressingInfo *&ptr (void);
     IORAddressingInfo *operator-> (void);
-
+    
   private:
     IORAddressingInfo *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const IORAddressingInfo_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IORAddressingInfo;
-
-
-  class TargetAddress;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:53
+
+#if !defined (_GIOP_TARGETADDRESS_CH_)
+#define _GIOP_TARGETADDRESS_CH_
+  
   class TargetAddress_var;
-
+  
   class TAO_Export TargetAddress
   {
   public:
-    TargetAddress (void); // default constructor
-    TargetAddress (const TargetAddress &); // copy constructor
-    ~TargetAddress (void); // destructor
-    TargetAddress &operator= (const TargetAddress &); // copy constructor
-
+    TargetAddress (void);
+    TargetAddress (const TargetAddress &);
+    ~TargetAddress (void);
+    static void _tao_any_destructor (void*);
+    
+    TargetAddress &operator= (const TargetAddress &);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:115
+    
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:111
+    
     typedef TargetAddress_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    static void _tao_any_destructor (void*);
-
-
-    void object_key (const TAO_ObjectKey &);// set
-    const TAO_ObjectKey &object_key (void) const; // get method (read only)
-    TAO_ObjectKey &object_key (void); // get method (read/write only)
-
-    void profile (const IOP::TaggedProfile &);// set
-    const IOP::TaggedProfile &profile (void) const; // get method (read only)
-    IOP::TaggedProfile &profile (void); // get method (read/write only)
 
-    void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);// set
-    const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const; // get method (read only)
-    ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void); // get method (read/write only)
-
-    void _default ();
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:507
+    
+    void object_key (const TAO::ObjectKey &);
+    const TAO::ObjectKey &object_key (void) const;
+    TAO::ObjectKey &object_key (void);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    
+    void profile (const IOP::TaggedProfile &);
+    const IOP::TaggedProfile &profile (void) const;
+    IOP::TaggedProfile &profile (void);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    
+    void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
+    const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
+    ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:145
+    
+    void _default (void);
   private:
     CORBA::Short disc_;
+    CORBA::Short holder_;
+    
     union
     {
-      TAO_ObjectKey *object_key_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407
+      TAO::ObjectKey *object_key_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       IOP::TaggedProfile *profile_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
-    } u_; // end of union
-  // TAO extensions
-  void _reset (CORBA::Short, CORBA::Boolean);
-  // Frees any allocated storage
+    } u_;
+    
+    // TAO extension - frees any allocated storage.
+    void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress;
+
+#endif /* end #if !defined */
+
+#if !defined (_GIOP_TARGETADDRESS___VAR_CH_)
+#define _GIOP_TARGETADDRESS___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:85
+  
+  class TAO_Export TargetAddress_var
+  {
+  public:
+    TargetAddress_var (void);
+    TargetAddress_var (TargetAddress *);
+    TargetAddress_var (const TargetAddress_var &);
+    ~TargetAddress_var (void);
+    
+    TargetAddress_var &operator= (TargetAddress *);
+    TargetAddress_var &operator= (const TargetAddress_var &);
+    TargetAddress *operator-> (void);
+    const TargetAddress *operator-> (void) const;
+    
+    operator const TargetAddress &() const;
+    operator TargetAddress &();
+    operator TargetAddress &() const;
+      // Variable size types only.
+    operator TargetAddress *&();
+    
+    // in, inout, out, _retn 
+    const TargetAddress &in (void) const;
+    TargetAddress &inout (void);
+    TargetAddress *&out (void);
+    TargetAddress *_retn (void);
+    TargetAddress *ptr (void) const;
+  
+  private:
+    TargetAddress *ptr_;
+  };
 
-  void _reset (void);
-  // calls the above reset with finalize=1
+#endif /* end #if !defined */
 
-}; // GIOP::TargetAddress
+#if !defined (_GIOP_TARGETADDRESS___OUT_CH_)
+#define _GIOP_TARGETADDRESS___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:475
+  
+  class TAO_Export TargetAddress_out
+  {
+  public:
+    TargetAddress_out (TargetAddress *&);
+    TargetAddress_out (TargetAddress_var &);
+    TargetAddress_out (const TargetAddress_out &);
+    TargetAddress_out &operator= (const TargetAddress_out &);
+    TargetAddress_out &operator= (TargetAddress *);
+    operator TargetAddress *&();
+    TargetAddress *&ptr (void);
+    TargetAddress *operator-> (void);
+    
+  private:
+    TargetAddress *&ptr_;
+    // assignment from T_var not allowed.
+    void operator= (const TargetAddress_var &);
+  };
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TargetAddress;
+#endif /* end #if !defined */
 
-class TAO_Export TargetAddress_var
-{
-public:
-  TargetAddress_var (void); // default constructor
-  TargetAddress_var (TargetAddress *);
-  TargetAddress_var (const TargetAddress_var &); // copy constructor
-  ~TargetAddress_var (void); // destructor
-
-  TargetAddress_var &operator= (TargetAddress *);
-  TargetAddress_var &operator= (const TargetAddress_var &);
-  TargetAddress *operator-> (void);
-  const TargetAddress *operator-> (void) const;
-
-  operator const TargetAddress &() const;
-  operator TargetAddress &();
-  operator TargetAddress &() const;
-  // in, inout, out, _retn
-  const TargetAddress &in (void) const;
-  TargetAddress &inout (void);
-  TargetAddress *&out (void);
-  TargetAddress *_retn (void);
-  TargetAddress *ptr(void) const;
-
-private:
-  TargetAddress *ptr_;
-};
-
-class TAO_Export TargetAddress_out
-{
-public:
-  TargetAddress_out (TargetAddress *&);
-  TargetAddress_out (TargetAddress_var &);
-  TargetAddress_out (const TargetAddress_out &);
-  TargetAddress_out &operator= (const TargetAddress_out &);
-  TargetAddress_out &operator= (TargetAddress *);
-  operator TargetAddress *&();
-  TargetAddress *&ptr (void);
-  TargetAddress *operator-> (void);
-
-private:
-  TargetAddress *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const TargetAddress_var &);
-};
-
-// We dont have the _var _out for this struct. If need arises we can
-// add them later. For the present the Version struct alone should be
-// sufficient
-struct TAO_Export Version
-{
-  CORBA::Octet major;
-  CORBA::Octet minor;
-};
+  // We dont have the _var _out for this struct. If need arises we can
+  // add them later. For the present the Version struct alone should be
+  // sufficient
+  struct TAO_Export Version
+  {
+    static void _tao_any_destructor (void *);
+    CORBA::Octet major;
+    CORBA::Octet minor;
+  };
 
-class  TAO_Export Version_var
-{
-public:
-  Version_var (void);
-  Version_var (Version *);
-  Version_var (const Version_var &);
-  // Fixed-size types only.
-  Version_var (const Version &);
-  ~Version_var (void);
-
-  Version_var &operator= (Version *);
-  Version_var &operator= (const Version_var &);
-  // Fixed-size types only.
-  Version_var &operator= (const Version &);
-  Version *operator-> (void);
-  const Version *operator-> (void) const;
-
-  operator const Version &() const;
-  operator Version &();
-  operator Version &() const;
-
-  // in, inout, out, _retn
-  const Version &in (void) const;
-  Version &inout (void);
-  Version &out (void);
-  Version _retn (void);
-  Version *ptr (void) const;
-
-private:
-  Version *ptr_;
-};
-
-typedef Version &Version_out;
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
+  class  TAO_Export Version_var
+  {
+  public:
+    Version_var (void);
+    Version_var (Version *);
+    Version_var (const Version_var &);
+    // Fixed-size types only.
+    Version_var (const Version &);
+    ~Version_var (void);
+
+    Version_var &operator= (Version *);
+    Version_var &operator= (const Version_var &);
+    // Fixed-size types only.
+    Version_var &operator= (const Version &);
+    Version *operator-> (void);
+    const Version *operator-> (void) const;
+
+    operator const Version &() const;
+    operator Version &();
+    operator Version &() const;
+
+    // in, inout, out, _retn
+    const Version &in (void) const;
+    Version &inout (void);
+    Version &out (void);
+    Version _retn (void);
+    Version *ptr (void) const;
+
+  private:
+    Version *ptr_;
+  };
+
+  typedef Version &Version_out;
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module GIOP
 
-TAO_Export void operator<<= (CORBA::Any &,
-                             const GIOP::IORAddressingInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             GIOP::IORAddressingInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       GIOP::IORAddressingInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const GIOP::IORAddressingInfo *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const GIOP::TargetAddress &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             GIOP::TargetAddress*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       GIOP::TargetAddress *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const GIOP::TargetAddress *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingInfo *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::IORAddressingInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::IORAddressingInfo &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.i"
@@ -324,5 +451,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index f61aac328e9..3a36abb053d 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -1,121 +1,317 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class GIOP::IORAddressingInfo_var
+// Inline operations for class GIOP::Version_var
 // *************************************************************
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (void) // default constructor
+GIOP::Version_var::Version_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (GIOP::IORAddressingInfo *p)
+GIOP::Version_var::Version_var (Version *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (const GIOP::IORAddressingInfo_var &p) // copy constructor
+GIOP::Version_var::Version_var (const ::GIOP::Version_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, GIOP::IORAddressingInfo (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
+// Fixed-size types only.
 ACE_INLINE
-GIOP::IORAddressingInfo_var::~IORAddressingInfo_var (void) // destructor
+GIOP::Version_var::Version_var (const ::GIOP::Version &p)
+{
+  ACE_NEW (this->ptr_, ::GIOP::Version (p));
+}
+
+ACE_INLINE
+GIOP::Version_var::~Version_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (GIOP::IORAddressingInfo *p)
+ACE_INLINE
+GIOP::Version_var &
+GIOP::Version_var::operator= (Version *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (const GIOP::IORAddressingInfo_var &p)
+ACE_INLINE
+::GIOP::Version_var &
+GIOP::Version_var::operator= (const ::GIOP::Version_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          GIOP::IORAddressingInfo *deep_copy =
-            new GIOP::IORAddressingInfo (*p.ptr_);
-
+          Version *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Version (*_tao_struct_var.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
-              GIOP::IORAddressingInfo *tmp = deep_copy;
+              Version *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
+  
+  return *this;
+}
+
+// fixed-size types only
+ACE_INLINE GIOP::Version_var &
+GIOP::Version_var::operator= (const ::GIOP::Version &p)
+{
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::GIOP::Version (p),
+        *this
+      );
+  }
+  
+  return *this;
+}
+
+ACE_INLINE const ::GIOP::Version *
+GIOP::Version_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::GIOP::Version *
+GIOP::Version_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+GIOP::Version_var::operator const ::GIOP::Version &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+GIOP::Version_var::operator ::GIOP::Version &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+GIOP::Version_var::operator ::GIOP::Version &() const // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE const ::GIOP::Version &
+GIOP::Version_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::GIOP::Version &
+GIOP::Version_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// mapping for fixed size 
+ACE_INLINE ::GIOP::Version &
+GIOP::Version_var::out (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::GIOP::Version
+GIOP::Version_var::_retn (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::GIOP::Version *
+GIOP::Version_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class GIOP::IORAddressingInfo_var
+// *************************************************************
+
+ACE_INLINE
+GIOP::IORAddressingInfo_var::IORAddressingInfo_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+GIOP::IORAddressingInfo_var::IORAddressingInfo_var (IORAddressingInfo *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+GIOP::IORAddressingInfo_var::IORAddressingInfo_var (const ::GIOP::IORAddressingInfo_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::GIOP::IORAddressingInfo (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
 
+ACE_INLINE
+GIOP::IORAddressingInfo_var::~IORAddressingInfo_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+GIOP::IORAddressingInfo_var &
+GIOP::IORAddressingInfo_var::operator= (IORAddressingInfo *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::GIOP::IORAddressingInfo_var &
+GIOP::IORAddressingInfo_var::operator= (const ::GIOP::IORAddressingInfo_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IORAddressingInfo *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IORAddressingInfo (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              IORAddressingInfo *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
-ACE_INLINE const GIOP::IORAddressingInfo *
+ACE_INLINE const ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator const GIOP::IORAddressingInfo &() const // cast
+GIOP::IORAddressingInfo_var::operator const ::GIOP::IORAddressingInfo &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() // cast
+GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() const// cast
+GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const GIOP::IORAddressingInfo &
+// Variable-size types only.
+ACE_INLINE
+GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::GIOP::IORAddressingInfo &
 GIOP::IORAddressingInfo_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo &
+ACE_INLINE ::GIOP::IORAddressingInfo &
 GIOP::IORAddressingInfo_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE GIOP::IORAddressingInfo *&
+// Mapping for variable size.
+ACE_INLINE ::GIOP::IORAddressingInfo *&
 GIOP::IORAddressingInfo_var::out (void)
 {
   delete this->ptr_;
@@ -123,33 +319,36 @@ GIOP::IORAddressingInfo_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::_retn (void)
 {
-  GIOP::IORAddressingInfo *tmp = this->ptr_;
+  ::GIOP::IORAddressingInfo *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class GIOP::IORAddressingInfo_out
 // *************************************************************
 
 ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (GIOP::IORAddressingInfo *&p)
+GIOP::IORAddressingInfo_out::IORAddressingInfo_out (::GIOP::IORAddressingInfo *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (GIOP::IORAddressingInfo_var &p) // constructor from _var
+GIOP::IORAddressingInfo_out::IORAddressingInfo_out (IORAddressingInfo_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -157,115 +356,119 @@ GIOP::IORAddressingInfo_out::IORAddressingInfo_out (GIOP::IORAddressingInfo_var
 }
 
 ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (const GIOP::IORAddressingInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (GIOP::IORAddressingInfo_out&,p).ptr_)
+GIOP::IORAddressingInfo_out::IORAddressingInfo_out (const ::GIOP::IORAddressingInfo_out &p)
+  : ptr_ (ACE_const_cast (IORAddressingInfo_out&, p).ptr_)
 {}
 
-ACE_INLINE GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (const GIOP::IORAddressingInfo_out &p)
+ACE_INLINE
+GIOP::IORAddressingInfo_out &
+GIOP::IORAddressingInfo_out::operator= (const ::GIOP::IORAddressingInfo_out &p)
 {
-  this->ptr_ = ACE_const_cast (GIOP::IORAddressingInfo_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (IORAddressingInfo_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (GIOP::IORAddressingInfo *p)
+ACE_INLINE
+GIOP::IORAddressingInfo_out &
+GIOP::IORAddressingInfo_out::operator= (IORAddressingInfo *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-GIOP::IORAddressingInfo_out::operator GIOP::IORAddressingInfo *&() // cast
+ACE_INLINE 
+GIOP::IORAddressingInfo_out::operator ::GIOP::IORAddressingInfo *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *&
+ACE_INLINE ::GIOP::IORAddressingInfo *&
 GIOP::IORAddressingInfo_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::IORAddressingInfo *
+ACE_INLINE ::GIOP::IORAddressingInfo *
 GIOP::IORAddressingInfo_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ci.cpp:51
+
 // *************************************************************
 // Inline operations for union GIOP::TargetAddress
 // *************************************************************
 
-// destructor
-ACE_INLINE
-GIOP::TargetAddress::~TargetAddress (void)
-{
-  // finalize
-  this->_reset (this->disc_, 1);
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ci.cpp:164
 
-// this reset method is used by the decoding engine
-ACE_INLINE void
-GIOP::TargetAddress::_reset (void)
-{
-  this->_reset (this->disc_, 1);
-  ACE_OS::memcpy (&this->u_, 0, sizeof (this->u_));
-}
-
-// the implicit _default () method
-ACE_INLINE void
+ACE_INLINE
+void 
 GIOP::TargetAddress::_default ()
 {
   this->disc_ = -32768;
 }
 
-// accessor to set the discriminant
-ACE_INLINE void
+// Accessor to set the discriminant.
+ACE_INLINE
+void
 GIOP::TargetAddress::_d (CORBA::Short discval)
 {
   this->disc_ = discval;
 }
-// accessor to get the discriminant
-ACE_INLINE CORBA::Short
+
+// Accessor to get the discriminant.
+ACE_INLINE
+CORBA::Short
 GIOP::TargetAddress::_d (void) const
 {
   return this->disc_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:899
 
-// accessor to set the member
-ACE_INLINE void
-GIOP::TargetAddress::object_key (const TAO_ObjectKey &val)
+// Accessor to set the member.
+ACE_INLINE
+void
+GIOP::TargetAddress::object_key (const TAO::ObjectKey &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (0, 0);
   this->disc_ = 0;
   ACE_NEW (
       this->u_.object_key_,
-      TAO_ObjectKey (val)
+      TAO::ObjectKey (val)
     );
 }
 
-// readonly get method
-ACE_INLINE const TAO_ObjectKey &
+// Readonly get method.
+ACE_INLINE
+const TAO::ObjectKey &
 GIOP::TargetAddress::object_key (void) const
 {
   return *this->u_.object_key_;
 }
 
-// read/write get method
-ACE_INLINE TAO_ObjectKey &
+// Read/write get method.
+ACE_INLINE
+TAO::ObjectKey &
 GIOP::TargetAddress::object_key (void)
 {
   return *this->u_.object_key_;
 }
 
-// accessor to set the member
-ACE_INLINE void
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+
+// Accessor to set the member.
+ACE_INLINE
+void
 GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (1, 0);
   this->disc_ = 1;
   ACE_NEW (
@@ -274,25 +477,31 @@ GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
     );
 }
 
-// readonly get method
-ACE_INLINE const IOP::TaggedProfile &
+// Readonly get method.
+ACE_INLINE
+const IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void) const
 {
   return *this->u_.profile_;
 }
 
-// read/write get method
-ACE_INLINE IOP::TaggedProfile &
+// Read/write get method.
+ACE_INLINE
+IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void)
 {
   return *this->u_.profile_;
 }
 
-// accessor to set the member
-ACE_INLINE void
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+
+// Accessor to set the member.
+ACE_INLINE
+void
 GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
 {
-  // set the discriminant val
+  // Set the discriminant value.
   this->_reset (2, 0);
   this->disc_ = 2;
   ACE_NEW (
@@ -301,133 +510,159 @@ GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
     );
 }
 
-// readonly get method
-ACE_INLINE const GIOP::IORAddressingInfo &
+// Readonly get method.
+ACE_INLINE
+const GIOP::IORAddressingInfo &
 GIOP::TargetAddress::ior (void) const
 {
   return *this->u_.ior_;
 }
 
-// read/write get method
-ACE_INLINE GIOP::IORAddressingInfo &
+// Read/write get method.
+ACE_INLINE
+GIOP::IORAddressingInfo &
 GIOP::TargetAddress::ior (void)
 {
   return *this->u_.ior_;
 }
 
-
 #if !defined (_GIOP_TARGETADDRESS___VAR_CI_)
 #define _GIOP_TARGETADDRESS___VAR_CI_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:211
+
 // *************************************************************
 // Inline operations for class GIOP::TargetAddress_var
 // *************************************************************
 
 ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (void) // default constructor
+GIOP::TargetAddress_var::TargetAddress_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (GIOP::TargetAddress *p)
+GIOP::TargetAddress_var::TargetAddress_var (TargetAddress *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (const GIOP::TargetAddress_var &p) // copy constructor
+GIOP::TargetAddress_var::TargetAddress_var (const ::GIOP::TargetAddress_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, GIOP::TargetAddress (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::GIOP::TargetAddress (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::~TargetAddress_var (void) // destructor
+GIOP::TargetAddress_var::~TargetAddress_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (GIOP::TargetAddress *p)
+ACE_INLINE
+::GIOP::TargetAddress_var &
+GIOP::TargetAddress_var::operator= (TargetAddress *_tao_union_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_union_var;
   return *this;
 }
 
-ACE_INLINE GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (const GIOP::TargetAddress_var &p)
+ACE_INLINE
+::GIOP::TargetAddress_var &
+GIOP::TargetAddress_var::operator= (const ::GIOP::TargetAddress_var &_tao_union_var)
 {
-  if (this != &p)
+  if (this != &_tao_union_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_union_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          GIOP::TargetAddress *deep_copy =
-            new GIOP::TargetAddress (*p.ptr_);
-
+          TargetAddress *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TargetAddress (*_tao_union_var.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
-              GIOP::TargetAddress *tmp = deep_copy;
+              TargetAddress *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const GIOP::TargetAddress *
+ACE_INLINE
+const ::GIOP::TargetAddress *
 GIOP::TargetAddress_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator const GIOP::TargetAddress &() const // cast
+GIOP::TargetAddress_var::operator const ::GIOP::TargetAddress &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() // cast
+GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() const// cast
+GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() const// cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const GIOP::TargetAddress &
+// Variable-size types only.
+ACE_INLINE
+GIOP::TargetAddress_var::operator ::GIOP::TargetAddress *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+const ::GIOP::TargetAddress &
 GIOP::TargetAddress_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress &
+ACE_INLINE
+::GIOP::TargetAddress &
 GIOP::TargetAddress_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE GIOP::TargetAddress *&
+// Mapping for variable size.
+ACE_INLINE
+::GIOP::TargetAddress *&
 GIOP::TargetAddress_var::out (void)
 {
   delete this->ptr_;
@@ -435,40 +670,43 @@ GIOP::TargetAddress_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_var::_retn (void)
 {
-  GIOP::TargetAddress *tmp = this->ptr_;
+  ::GIOP::TargetAddress *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_GIOP_TARGETADDRESS___OUT_CI_)
 #define _GIOP_TARGETADDRESS___OUT_CI_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:556
+
 // *************************************************************
 // Inline operations for class GIOP::TargetAddress_out
 // *************************************************************
 
 ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (GIOP::TargetAddress *&p)
+GIOP::TargetAddress_out::TargetAddress_out (TargetAddress *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (GIOP::TargetAddress_var &p) // constructor from _var
+GIOP::TargetAddress_out::TargetAddress_out (TargetAddress_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -476,236 +714,153 @@ GIOP::TargetAddress_out::TargetAddress_out (GIOP::TargetAddress_var &p) // const
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (const GIOP::TargetAddress_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (GIOP::TargetAddress_out&,p).ptr_)
+GIOP::TargetAddress_out::TargetAddress_out (const ::GIOP::TargetAddress_out &p)
+  : ptr_ (ACE_const_cast (TargetAddress_out&, p).ptr_)
 {}
 
-ACE_INLINE GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (const GIOP::TargetAddress_out &p)
+ACE_INLINE
+::GIOP::TargetAddress_out &
+GIOP::TargetAddress_out::operator= (const ::GIOP::TargetAddress_out &p)
 {
-  this->ptr_ = ACE_const_cast (GIOP::TargetAddress_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (TargetAddress_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (GIOP::TargetAddress *p)
+ACE_INLINE
+::GIOP::TargetAddress_out &
+GIOP::TargetAddress_out::operator= (TargetAddress *_tao_union_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_union_out;
   return *this;
 }
 
 ACE_INLINE
-GIOP::TargetAddress_out::operator GIOP::TargetAddress *&() // cast
+GIOP::TargetAddress_out::operator ::GIOP::TargetAddress *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *&
+ACE_INLINE
+::GIOP::TargetAddress *&
 GIOP::TargetAddress_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE GIOP::TargetAddress *
+ACE_INLINE
+::GIOP::TargetAddress *
 GIOP::TargetAddress_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for class GIOP::Version_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::Version_var::Version_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (Version *p)
-  : ptr_ (p)
-{}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version_var &p) // copy constructor
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const GIOP::Version &_tao_aggregate
+  )
 {
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
+  if (
+    (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
+    (strm << CORBA::Any::from_octet (_tao_aggregate.minor))
+   )
+    {
+      return 1;
+    }
   else
-    this->ptr_ = 0;
-}
-
-// fixed-size types only
-ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version &p)
-{
-  ACE_NEW (this->ptr_, ::GIOP::Version (p));
-}
-
-ACE_INLINE
-GIOP::Version_var::~Version_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE GIOP::Version_var &
-GIOP::Version_var::operator= (Version *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version_var &p)
-{
-  if (this != &p)
     {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Version *deep_copy =
-            new Version (*p.ptr_);
-
-          if (deep_copy != 0)
-            {
-              Version *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
+      return 0;
     }
-
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::GIOP::Version (p), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const ::GIOP::Version *
-GIOP::Version_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::operator-> (void)
-{
-  return this->ptr_;
 }
 
 ACE_INLINE
-GIOP::Version_var::operator const ::GIOP::Version &() const // cast
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    GIOP::Version &_tao_aggregate
+  )
 {
-  return *this->ptr_;
+  if (
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor))
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() // cast
-{
-  return *this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::GIOP::Version &
-GIOP::Version_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version
-GIOP::Version_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const GIOP::IORAddressingInfo &_tao_aggregate)
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const GIOP::IORAddressingInfo &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.selected_profile_index) &&
     (strm << _tao_aggregate.ior)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::IORAddressingInfo &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    GIOP::IORAddressingInfo &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.selected_profile_index) &&
     (strm >> _tao_aggregate.ior)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const GIOP::Version &ver)
-{
-  if ((strm.write_octet (ver.major)) &&
-      (strm.write_octet (ver.minor)))
-    return 1;
-  else
-    return 0;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
-}
+#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
+#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::Version &ver)
-{
-  if ((strm.read_octet (ver.major)) &&
-       (strm.read_octet (ver.minor)))
-      return 1;
-      else
-      return 0;
-}
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    TAO::ObjectKey &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    TAO::ObjectKey &
+  );
 
+#endif /* _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ci.cpp:69
 
-ACE_INLINE CORBA::Boolean operator<< (
+ACE_INLINE
+CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const GIOP::TargetAddress &_tao_union
   )
@@ -714,7 +869,9 @@ ACE_INLINE CORBA::Boolean operator<< (
     {
       return 0;
     }
+  
   CORBA::Boolean result = 1;
+  
   switch (_tao_union._d ())
   {
     case 0:
@@ -735,10 +892,12 @@ ACE_INLINE CORBA::Boolean operator<< (
     default:
       break;
   }
+  
   return result;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (
+ACE_INLINE
+CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     GIOP::TargetAddress &_tao_union
   )
@@ -748,36 +907,52 @@ ACE_INLINE CORBA::Boolean operator>> (
     {
       return 0;
     }
+  
   CORBA::Boolean result = 1;
+  
   switch (_tao_discriminant)
   {
     case 0:
       {
-        TAO_ObjectKey _tao_union_tmp;
+        TAO::ObjectKey _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.object_key (_tao_union_tmp);
+          {
+            _tao_union.object_key (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     case 1:
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.profile (_tao_union_tmp);
+          {
+            _tao_union.profile (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     case 2:
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
+        
         if (result)
-          _tao_union.ior (_tao_union_tmp);
+          {
+            _tao_union.ior (_tao_union_tmp);
+            _tao_union._d (_tao_discriminant);
+          }
       }
       break;
     default:
       _tao_union._d (_tao_discriminant);
       break;
   }
+  
   return result;
 }
+
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 9ac3f504ed7..3c187831168 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1053,10 +1053,10 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
                                          CORBA::COMPLETED_NO));
         }
 
-      TAO_ObjectKey tmp_key (locate_request.object_key ().length (),
-                             locate_request.object_key ().length (),
-                             locate_request.object_key ().get_buffer (),
-                             0);
+      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
+                              locate_request.object_key ().length (),
+                              locate_request.object_key ().get_buffer (),
+                              0);
 
       // Set it to an error state
       parse_error = 1;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 8a9d0e3e67c..31c663c8ad3 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -45,7 +45,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
+
   if (key)
     {
       // Put in the object key
@@ -95,7 +96,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
+
   if (key)
     {
       // Everything is fine
@@ -367,7 +369,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
 
       request.requesting_principal (principal.in ()); */
 
-      CORBA_OctetSeq oct_seq;
+      CORBA::OctetSeq oct_seq;
       input >> oct_seq;
       request.requesting_principal (oct_seq);
       hdr_status = (CORBA::Boolean) input.good_bit ();
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 9ea95da50fc..92bcb018c2b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -477,7 +477,8 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
         msg << GIOP::KeyAddr;
 
         // Get the object key
-        const TAO_ObjectKey *key = spec.object_key ();
+        const TAO::ObjectKey *key = spec.object_key ();
+
         if (key)
           {
             // Marshall in the object key
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 6395e1afa27..067a5cfcd05 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -910,10 +910,10 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
                                   sizeof repbuf);
       // This output CDR is not used!
 
-      TAO_ObjectKey tmp_key (locate_request.object_key ().length (),
-                             locate_request.object_key ().length (),
-                             locate_request.object_key ().get_buffer (),
-                             0);
+      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
+                              locate_request.object_key ().length (),
+                              locate_request.object_key ().get_buffer (),
+                              0);
 
       // Set it to an error state
       parse_error = 1;
@@ -1206,7 +1206,7 @@ TAO_GIOP_Message_Lite::write_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
 
   if (key != 0)
     {
@@ -1244,7 +1244,7 @@ TAO_GIOP_Message_Lite::write_locate_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
 
   if (key)
     {
@@ -1363,7 +1363,7 @@ TAO_GIOP_Message_Lite::parse_locate_header (
   // Store it in the Locate request classes.
   request.request_id (req_id);
 
-  TAO_ObjectKey &object_key =
+  TAO::ObjectKey &object_key =
     request.object_key ();
 
   // Note that here there are no unions and so no problems.
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 6c46c74ce6b..1f4420151af 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -46,10 +46,10 @@ public:
   CORBA::ULong request_id (void);
 
   /// Get the object_key in read mode..
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// Get the object_key in read/write mode..
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /// Get the reference to the underlying profile
   TAO_Tagged_Profile &profile (void);
@@ -65,7 +65,7 @@ private:
   TAO_Tagged_Profile profile_;
 
   /// Object Key
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Incoming CDR stream
   TAO_InputCDR *incoming_;
diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i
index 208019a5dea..8b8025c4603 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.i
+++ b/TAO/tao/GIOP_Message_Locate_Header.i
@@ -22,13 +22,13 @@ TAO_GIOP_Locate_Request_Header::request_id (void)
   return this->request_id_;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_GIOP_Locate_Request_Header::object_key (void) const
 {
   return this->profile_.object_key ();
 }
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_GIOP_Locate_Request_Header::object_key (void)
 {
   return this->profile_.object_key ();
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index 21064aa7983..835a640776e 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -8,7 +8,7 @@
 //   is:
 //
 //     tao_idl \
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export \
 //          -Wb,export_include="tao/TAO_Export.h" \
 //          -Wb,pre_include="ace/pre.h" \
@@ -39,8 +39,4 @@ module IIOP
   };
 };
 
-
-
-#pragma prefix ""
-
 #endif  /* TAO_IIOP_PIDL */
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 928dd51e586..2d0745c3e3c 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -19,486 +19,603 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "tao/IIOPC.h"
 #include "tao/Typecode.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "IIOPC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_ListenPoint[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-  12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+    12,
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x696e7400),  // name = ListenPoint
   2, // member count
-  5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-  CORBA::tk_string,
+    5,
+  ACE_NTOHL (0x686f7374), 
+  ACE_NTOHL (0x0),  // name = host
+    CORBA::tk_string, 
   0U, // string length
-  5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-  CORBA::tk_ushort,
+  5,
+  ACE_NTOHL (0x706f7274), 
+  ACE_NTOHL (0x0),  // name = port
+    CORBA::tk_ushort,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (CORBA::tk_struct, sizeof (_oc_IIOP_ListenPoint), (char *) &_oc_IIOP_ListenPoint, 0, sizeof (IIOP::ListenPoint));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
+    CORBA::tk_struct,
+    sizeof (_oc_IIOP_ListenPoint),
+    (char *) &_oc_IIOP_ListenPoint,
+    0,
+    sizeof (IIOP::ListenPoint)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPoint, &_tc_TAO_tc_IIOP_ListenPoint)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ListenPoint,
+    &_tc_TAO_tc_IIOP_ListenPoint
+  )
 TAO_NAMESPACE_END
-void IIOP::ListenPoint::_tao_any_destructor (void *x)
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ListenPoint *tmp = ACE_static_cast (ListenPoint*,x);
+  ListenPoint *tmp = ACE_static_cast (ListenPoint*, _tao_void_pointer);
   delete tmp;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_
 
-  void
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_allocate_buffer (CORBA::ULong length)
-  {
-    IIOP::ListenPoint* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length);
-
-    if (this->buffer_ != 0)
+void
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_allocate_buffer (CORBA::ULong length)
+{
+  IIOP::ListenPoint* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length);
+  
+  if (this->buffer_ != 0)
     {
-      IIOP::ListenPoint *old = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_);
-
+      IIOP::ListenPoint *old =
+        ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
+        {
+          tmp[i] = old[i];
+        }
+      
       if (this->release_)
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
-
+        {
+          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
+        }
     }
-    this->buffer_ = tmp;
-  }
+  
+  this->buffer_ = tmp;
+}
 
-  void
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
+void
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
       return;
-
-    IIOP::ListenPoint *tmp = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_);
-
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
+    }
+  
+  IIOP::ListenPoint *tmp =
+    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+  _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
+{
+  this->_deallocate_buffer ();
+}
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
 #define _IIOP_LISTENPOINTLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IIOP::ListenPointList
 // *************************************************************
 
 IIOP::ListenPointList::ListenPointList (void)
 {}
-IIOP::ListenPointList::ListenPointList (CORBA::ULong max) // uses max size
-  :
+
+IIOP::ListenPointList::ListenPointList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IIOP::ListenPointList::ListenPointList (CORBA::ULong max, CORBA::ULong length, IIOP::ListenPoint *buffer, CORBA::Boolean release)
-  :
+
+IIOP::ListenPointList::ListenPointList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IIOP::ListenPoint *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) // copy ctor
-  :
+
+IIOP::ListenPointList::ListenPointList (const ListenPointList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IIOP::ListenPointList::~ListenPointList (void) // dtor
 {}
-void IIOP::ListenPointList::_tao_any_destructor (void *x)
+
+void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ListenPointList *tmp = ACE_static_cast (ListenPointList*,x);
+  ListenPointList *tmp = ACE_static_cast (ListenPointList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_ListenPointList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-  16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400),  // name = ListenPointList
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
+    16,
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x696e744c), 
+  ACE_NTOHL (0x69737400),  // name = ListenPointList
+    CORBA::tk_sequence, // typecode kind
   116, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     100, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-      12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+      33,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x2f4c6973), 
+      ACE_NTOHL (0x74656e50), 
+      ACE_NTOHL (0x6f696e74), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+            12,
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x656e506f), 
+      ACE_NTOHL (0x696e7400),  // name = ListenPoint
       2, // member count
-      5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-      CORBA::tk_string,
+            5,
+      ACE_NTOHL (0x686f7374), 
+      ACE_NTOHL (0x0),  // name = host
+            CORBA::tk_string, 
       0U, // string length
-      5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-      CORBA::tk_ushort,
+      5,
+      ACE_NTOHL (0x706f7274), 
+      ACE_NTOHL (0x0),  // name = port
+            CORBA::tk_ushort,
 
 
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (CORBA::tk_alias, sizeof (_oc_IIOP_ListenPointList), (char *) &_oc_IIOP_ListenPointList, 0, sizeof (IIOP::ListenPointList));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
+    CORBA::tk_alias,
+    sizeof (_oc_IIOP_ListenPointList),
+    (char *) &_oc_IIOP_ListenPointList,
+    0,
+    sizeof (IIOP::ListenPointList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPointList, &_tc_TAO_tc_IIOP_ListenPointList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ListenPointList,
+    &_tc_TAO_tc_IIOP_ListenPointList
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f426944), ACE_NTOHL (0x69724949), ACE_NTOHL (0x4f505365), ACE_NTOHL (0x72766963), ACE_NTOHL (0x65436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
-  24, ACE_NTOHL (0x42694469), ACE_NTOHL (0x7249494f), ACE_NTOHL (0x50536572), ACE_NTOHL (0x76696365), ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f426944), 
+  ACE_NTOHL (0x69724949), 
+  ACE_NTOHL (0x4f505365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65436f6e), 
+  ACE_NTOHL (0x74657874), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
+    24,
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x7249494f), 
+  ACE_NTOHL (0x50536572), 
+  ACE_NTOHL (0x76696365), 
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
   1, // member count
-  14, ACE_NTOHL (0x6c697374), ACE_NTOHL (0x656e5f70), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x73000000),  // name = listen_points
-  CORBA::tk_alias, // typecode kind for typedefs
+    14,
+  ACE_NTOHL (0x6c697374), 
+  ACE_NTOHL (0x656e5f70), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x73000000),  // name = listen_points
+    CORBA::tk_alias, // typecode kind for typedefs
   192, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-    16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400),  // name = ListenPointList
-    CORBA::tk_sequence, // typecode kind
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x49494f50), 
+    ACE_NTOHL (0x2f4c6973), 
+    ACE_NTOHL (0x74656e50), 
+    ACE_NTOHL (0x6f696e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
+        16,
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x656e506f), 
+    ACE_NTOHL (0x696e744c), 
+    ACE_NTOHL (0x69737400),  // name = ListenPointList
+        CORBA::tk_sequence, // typecode kind
     116, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       100, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-        12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x49494f50), 
+        ACE_NTOHL (0x2f4c6973), 
+        ACE_NTOHL (0x74656e50), 
+        ACE_NTOHL (0x6f696e74), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+                12,
+        ACE_NTOHL (0x4c697374), 
+        ACE_NTOHL (0x656e506f), 
+        ACE_NTOHL (0x696e7400),  // name = ListenPoint
         2, // member count
-        5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-        CORBA::tk_string,
+                5,
+        ACE_NTOHL (0x686f7374), 
+        ACE_NTOHL (0x0),  // name = host
+                CORBA::tk_string, 
         0U, // string length
-        5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-        CORBA::tk_ushort,
+        5,
+        ACE_NTOHL (0x706f7274), 
+        ACE_NTOHL (0x0),  // name = port
+                CORBA::tk_ushort,
 
 
       0U,
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (CORBA::tk_struct, sizeof (_oc_IIOP_BiDirIIOPServiceContext), (char *) &_oc_IIOP_BiDirIIOPServiceContext, 0, sizeof (IIOP::BiDirIIOPServiceContext));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
+    CORBA::tk_struct,
+    sizeof (_oc_IIOP_BiDirIIOPServiceContext),
+    (char *) &_oc_IIOP_BiDirIIOPServiceContext,
+    0,
+    sizeof (IIOP::BiDirIIOPServiceContext)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BiDirIIOPServiceContext, &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BiDirIIOPServiceContext,
+    &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext
+  )
 TAO_NAMESPACE_END
-void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *x)
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer)
 {
-  BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*,x);
+  BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*, _tao_void_pointer);
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IIOP::ListenPoint &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IIOP::ListenPoint &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy (
+      _tao_any,
+      IIOP::ListenPoint::_tao_any_destructor,
       IIOP::_tc_ListenPoint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPoint *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::ListenPoint *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert (
+      _tao_any,
+      IIOP::ListenPoint::_tao_any_destructor,
       IIOP::_tc_ListenPoint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::ListenPoint::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPoint *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::ListenPoint *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IIOP::ListenPoint*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::ListenPoint *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::ListenPoint *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPoint ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::ListenPoint*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::ListenPoint *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::ListenPoint, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_ListenPoint,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::ListenPoint::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract (
+        _tao_any,
+        IIOP::ListenPoint::_tao_any_destructor,
+        IIOP::_tc_ListenPoint,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IIOP::ListenPoint>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPoint>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IIOP::ListenPointList &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IIOP::_tc_ListenPointList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
+      _tao_any,
+      IIOP::ListenPointList::_tao_any_destructor,
+      IIOP::_tc_ListenPointList,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPointList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::ListenPointList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
+      _tao_any,
+      IIOP::ListenPointList::_tao_any_destructor,
       IIOP::_tc_ListenPointList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::ListenPointList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPointList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::ListenPointList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IIOP::ListenPointList*&,
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::ListenPointList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::ListenPointList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPointList ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::ListenPointList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::ListenPointList *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::ListenPointList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_ListenPointList,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::ListenPointList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
+        _tao_any,
+        IIOP::ListenPointList::_tao_any_destructor,
+        IIOP::_tc_ListenPointList,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IIOP::BiDirIIOPServiceContext &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy (
+      _tao_any,
+      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
       IIOP::_tc_BiDirIIOPServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::BiDirIIOPServiceContext *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert (
+      _tao_any,
+      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
       IIOP::_tc_BiDirIIOPServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::BiDirIIOPServiceContext *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IIOP::BiDirIIOPServiceContext*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::BiDirIIOPServiceContext *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::BiDirIIOPServiceContext *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_BiDirIIOPServiceContext
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::BiDirIIOPServiceContext*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::BiDirIIOPServiceContext *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::BiDirIIOPServiceContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_BiDirIIOPServiceContext,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::BiDirIIOPServiceContext::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract (
+        _tao_any,
+        IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
+        IIOP::_tc_BiDirIIOPServiceContext,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IIOP::ListenPointList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -507,21 +624,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index a868d5df5a2..a8ca954fe85 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IIOPC_H
-#define TAO_IDL_IIOPC_H
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_IIOPC_H_
+#define _TAO_IDL_ORIG_IIOPC_H_
 
 #include "ace/pre.h"
 #include "tao/TAO_Export.h"
@@ -40,7 +43,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
@@ -55,53 +57,67 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  IIOP
 {
-  struct ListenPoint;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ListenPoint_var;
-
+  
   struct TAO_Export ListenPoint
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ListenPoint_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::UShort port;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export ListenPoint_var
   {
   public:
-    ListenPoint_var (void); // default constructor
+    ListenPoint_var (void);
     ListenPoint_var (ListenPoint *);
-    ListenPoint_var (const ListenPoint_var &); // copy constructor
-    ~ListenPoint_var (void); // destructor
-
+    ListenPoint_var (const ListenPoint_var &);
+    ~ListenPoint_var (void);
+    
     ListenPoint_var &operator= (ListenPoint *);
     ListenPoint_var &operator= (const ListenPoint_var &);
     ListenPoint *operator-> (void);
     const ListenPoint *operator-> (void) const;
-
+    
     operator const ListenPoint &() const;
     operator ListenPoint &();
     operator ListenPoint &() const;
-    operator ListenPoint *&(); // variable-size types only
-
-    // in, inout, out, _retn
+    
+    // Variable-size types only.
+    operator ListenPoint *&();
+    
+    // in, inout, out, _retn 
     const ListenPoint &in (void) const;
     ListenPoint &inout (void);
     ListenPoint *&out (void);
     ListenPoint *_retn (void);
     ListenPoint *ptr (void) const;
-
+  
   private:
     ListenPoint *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export ListenPoint_out
   {
   public:
@@ -113,143 +129,167 @@ TAO_NAMESPACE  IIOP
     operator ListenPoint *&();
     ListenPoint *&ptr (void);
     ListenPoint *operator-> (void);
-
+    
   private:
     ListenPoint *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ListenPoint_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPoint;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IIOP_ListenPointList : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum,
+  
+  class TAO_Export _TAO_Unbounded_Sequence_IIOP_ListenPointList
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
+    _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         ListenPoint *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList &operator= (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs);
-      virtual ~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void); // Dtor.
-      // = Accessors.
-      ListenPoint &operator[] (CORBA::ULong i);
-      const ListenPoint &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static ListenPoint *allocbuf (CORBA::ULong size);
-      static void freebuf (ListenPoint *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      ListenPoint *get_buffer (CORBA::Boolean orphan = 0);
-      const ListenPoint *get_buffer (void) const;
-      void replace (CORBA::ULong max,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
+        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
+      );
+    _TAO_Unbounded_Sequence_IIOP_ListenPointList &operator= (
+        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
+    
+    // = Accessors.
+    ListenPoint &operator[] (CORBA::ULong i);
+    const ListenPoint &operator[] (CORBA::ULong i) const;
+    
+    // = Static operations.
+    static ListenPoint *allocbuf (CORBA::ULong size);
+    static void freebuf (ListenPoint *buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ListenPoint *get_buffer (CORBA::Boolean orphan = 0);
+    const ListenPoint *get_buffer (void) const;
+    void replace (
+        CORBA::ULong max,
         CORBA::ULong length,
         ListenPoint *data,
-        CORBA::Boolean release);
-    };
+        CORBA::Boolean release
+      );
+  };
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IIOP_LISTENPOINTLIST_CH_)
 #define _IIOP_LISTENPOINTLIST_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ListenPointList;
   class ListenPointList_var;
-
+  
   // *************************************************************
-  // ListenPointList
+  // IIOP::ListenPointList
   // *************************************************************
+  
+  class TAO_Export ListenPointList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_Export ListenPointList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList
+  _TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ListenPointList (void); // default ctor
-    ListenPointList (CORBA::ULong max); // uses max size
+    ListenPointList (void);
+    ListenPointList (CORBA::ULong max);
     ListenPointList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      ListenPoint *buffer,
-      CORBA::Boolean release = 0
-    );
-    ListenPointList (const ListenPointList &); // copy ctor
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ListenPoint *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ListenPointList (const ListenPointList &);
     ~ListenPointList (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ListenPointList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_IIOP_LISTENPOINTLIST___VAR_CH_)
 #define _IIOP_LISTENPOINTLIST___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class IIOP::ListenPointList_var
   // *************************************************************
-
+  
   class TAO_Export ListenPointList_var
   {
   public:
-    ListenPointList_var (void); // default constructor
+    ListenPointList_var (void);
     ListenPointList_var (ListenPointList *);
-    ListenPointList_var (const ListenPointList_var &); // copy constructor
-    ~ListenPointList_var (void); // destructor
-
+    ListenPointList_var (const ListenPointList_var &);
+    ~ListenPointList_var (void);
+    
     ListenPointList_var &operator= (ListenPointList *);
     ListenPointList_var &operator= (const ListenPointList_var &);
     ListenPointList *operator-> (void);
     const ListenPointList *operator-> (void) const;
-
+    
     operator const ListenPointList &() const;
     operator ListenPointList &();
     operator ListenPointList &() const;
-    operator ListenPointList *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator ListenPointList *&();
+    
     ListenPoint & operator[] (CORBA::ULong index);
     const ListenPoint & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ListenPointList &in (void) const;
     ListenPointList &inout (void);
     ListenPointList *&out (void);
     ListenPointList *_retn (void);
     ListenPointList *ptr (void) const;
-
+  
   private:
     ListenPointList *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_IIOP_LISTENPOINTLIST___OUT_CH_)
 #define _IIOP_LISTENPOINTLIST___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export ListenPointList_out
   {
   public:
@@ -262,62 +302,70 @@ TAO_NAMESPACE  IIOP
     ListenPointList *&ptr (void);
     ListenPointList *operator-> (void);
     ListenPoint & operator[] (CORBA::ULong index);
-
+  
   private:
     ListenPointList *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ListenPointList_var &);
   };
 
-
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPointList;
-
-  struct BiDirIIOPServiceContext;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class BiDirIIOPServiceContext_var;
-
+  
   struct TAO_Export BiDirIIOPServiceContext
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef BiDirIIOPServiceContext_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (IIOP, ListenPointList) listen_points;
+    
+    static void _tao_any_destructor (void *);
+    IIOP::ListenPointList listen_points;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export BiDirIIOPServiceContext_var
   {
   public:
-    BiDirIIOPServiceContext_var (void); // default constructor
+    BiDirIIOPServiceContext_var (void);
     BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &); // copy constructor
-    ~BiDirIIOPServiceContext_var (void); // destructor
-
+    BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &);
+    ~BiDirIIOPServiceContext_var (void);
+    
     BiDirIIOPServiceContext_var &operator= (BiDirIIOPServiceContext *);
     BiDirIIOPServiceContext_var &operator= (const BiDirIIOPServiceContext_var &);
     BiDirIIOPServiceContext *operator-> (void);
     const BiDirIIOPServiceContext *operator-> (void) const;
-
+    
     operator const BiDirIIOPServiceContext &() const;
     operator BiDirIIOPServiceContext &();
     operator BiDirIIOPServiceContext &() const;
-    operator BiDirIIOPServiceContext *&(); // variable-size types only
-
-    // in, inout, out, _retn
+    
+    // Variable-size types only.
+    operator BiDirIIOPServiceContext *&();
+    
+    // in, inout, out, _retn 
     const BiDirIIOPServiceContext &in (void) const;
     BiDirIIOPServiceContext &inout (void);
     BiDirIIOPServiceContext *&out (void);
     BiDirIIOPServiceContext *_retn (void);
     BiDirIIOPServiceContext *ptr (void) const;
-
+  
   private:
     BiDirIIOPServiceContext *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export BiDirIIOPServiceContext_out
   {
   public:
@@ -329,37 +377,62 @@ TAO_NAMESPACE  IIOP
     operator BiDirIIOPServiceContext *&();
     BiDirIIOPServiceContext *&ptr (void);
     BiDirIIOPServiceContext *operator-> (void);
-
+    
   private:
     BiDirIIOPServiceContext *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const BiDirIIOPServiceContext_var &);
   };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module IIOP
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_
 #define _TAO_CDR_OP_IIOP_ListenPointList_H_
 
@@ -374,11 +447,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IIOPC.i"
@@ -388,5 +469,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index df1e0b8bbcd..bd3a849fa93 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class IIOP::ListenPoint_var
 // *************************************************************
 
 ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (void) // default constructor
+IIOP::ListenPoint_var::ListenPoint_var (void)
   : ptr_ (0)
 {}
 
@@ -34,46 +38,56 @@ IIOP::ListenPoint_var::ListenPoint_var (ListenPoint *p)
 {}
 
 ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p) // copy constructor
+IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::ListenPoint_var::~ListenPoint_var (void) // destructor
+IIOP::ListenPoint_var::~ListenPoint_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (ListenPoint *p)
+ACE_INLINE
+IIOP::ListenPoint_var &
+IIOP::ListenPoint_var::operator= (ListenPoint *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &p)
+ACE_INLINE
+::IIOP::ListenPoint_var &
+IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          IIOP::ListenPoint *deep_copy = 
-            new IIOP::ListenPoint (*p.ptr_);
+          ListenPoint *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ListenPoint (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::ListenPoint *tmp = deep_copy;
+              ListenPoint *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -114,7 +128,7 @@ IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::ListenPoint_var::operator ::IIOP::ListenPoint *&() // cast 
 {
@@ -133,7 +147,7 @@ IIOP::ListenPoint_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IIOP::ListenPoint *&
 IIOP::ListenPoint_var::out (void)
 {
@@ -156,6 +170,9 @@ IIOP::ListenPoint_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class IIOP::ListenPoint_out
 // *************************************************************
@@ -168,7 +185,7 @@ IIOP::ListenPoint_out::ListenPoint_out (::IIOP::ListenPoint *&p)
 }
 
 ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p) // constructor from _var
+IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p) // constructor from
 }
 
 ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p) // copy constructor
+IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p)
   : ptr_ (ACE_const_cast (ListenPoint_out&, p).ptr_)
 {}
 
-ACE_INLINE IIOP::ListenPoint_out &
+ACE_INLINE
+IIOP::ListenPoint_out &
 IIOP::ListenPoint_out::operator= (const ::IIOP::ListenPoint_out &p)
 {
   this->ptr_ = ACE_const_cast (ListenPoint_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IIOP::ListenPoint_out &
-IIOP::ListenPoint_out::operator= (ListenPoint *p)
+ACE_INLINE
+IIOP::ListenPoint_out &
+IIOP::ListenPoint_out::operator= (ListenPoint *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ IIOP::ListenPoint_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_
 
-  // = Static operations.
-  ACE_INLINE IIOP::ListenPoint *
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    IIOP::ListenPoint *retval = 0;
-    ACE_NEW_RETURN (retval, IIOP::ListenPoint[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (IIOP::ListenPoint *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum,
+ACE_INLINE
+IIOP::ListenPoint *
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size)
+{
+  IIOP::ListenPoint *retval = 0;
+  ACE_NEW_RETURN (retval, IIOP::ListenPoint[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (IIOP::ListenPoint *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
+{
+}
+
+ACE_INLINE
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
+    CORBA::ULong maximum,
     CORBA::ULong length,
     IIOP::ListenPoint *data,
-    CORBA::Boolean release)
+    CORBA::Boolean release
+  )
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
+{
+}
+
+ACE_INLINE
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
+    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
     {
-      IIOP::ListenPoint *tmp1 = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->maximum_);
-      IIOP::ListenPoint * const tmp2 = ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
+      IIOP::ListenPoint *tmp1 =
+        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->maximum_);
+      IIOP::ListenPoint * const tmp2 =
+        ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
+        {
+          tmp1[i] = tmp2[i];
+        }
       
       this->buffer_ = tmp1;
     }
-    else
+  else
     {
       this->buffer_ = 0;
     }
-  }
-  
-  ACE_INLINE IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList &
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator= (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
+}
+
+ACE_INLINE
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList &
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator= (
+    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
+  )
+{
+  if (this == &rhs)
+    {
       return *this;
-    
-    if (this->release_)
+    }
+  
+  if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        IIOP::ListenPoint *tmp = ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-      }
+        {
+          // Free the old buffer.
+          IIOP::ListenPoint *tmp =
+            ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
+        }
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IIOP::ListenPoint *tmp1 = ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-    IIOP::ListenPoint * const tmp2 = ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  // = Accessors.
-  ACE_INLINE IIOP::ListenPoint &
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IIOP::ListenPoint* tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
-    return tmp[i];
-  }
+  IIOP::ListenPoint *tmp1 =
+    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+  IIOP::ListenPoint * const tmp2 =
+    ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
   
-  ACE_INLINE const IIOP::ListenPoint &
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IIOP::ListenPoint * const tmp = ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+IIOP::ListenPoint &
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  IIOP::ListenPoint* tmp =
+    ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const IIOP::ListenPoint &
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  IIOP::ListenPoint * const tmp =
+    ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+IIOP::ListenPoint *
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan)
+{
+  IIOP::ListenPoint *result = 0;
   
-  ACE_INLINE IIOP::ListenPoint *
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan)
-  {
-    IIOP::ListenPoint *result = 0;
-    if (orphan == 0)
+  if (orphan == 0)
     {
       // We retain ownership.
       if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
+        {
+          result =
+            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
       else
-      {
-        result = ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-      }
+        {
+          result =
+            ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
+        }
     }
-    else // if (orphan == 1)
+  else // if (orphan == 1)
     {
       if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-    return result;
-  }
   
-  ACE_INLINE const IIOP::ListenPoint *
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const IIOP::ListenPoint * ACE_CAST_CONST, this->buffer_);
-  }
+  return result;
+}
+
+ACE_INLINE
+const IIOP::ListenPoint *
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const IIOP::ListenPoint * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IIOP::ListenPoint *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
   
-  ACE_INLINE void
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  IIOP::ListenPoint *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+  if (this->buffer_ && this->release_ == 1)
     {
-      IIOP::ListenPoint *tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
+      IIOP::ListenPoint *tmp =
+        ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
       _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
     }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
   
-#endif /* end #if !defined */
+  this->buffer_ = data;
+  this->release_ = release;
+}
 
+#endif /* end #if !defined */
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IIOP_LISTENPOINTLIST_CI_)
 #define _IIOP_LISTENPOINTLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class IIOP::ListenPointList_var
 // *************************************************************
 
 ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (void) // default constructor
+IIOP::ListenPointList_var::ListenPointList_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ IIOP::ListenPointList_var::ListenPointList_var (ListenPointList *p)
 {}
 
 ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p) // copy constructor
+IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::ListenPointList_var::~ListenPointList_var (void) // destructor
+IIOP::ListenPointList_var::~ListenPointList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPointList_var &
+ACE_INLINE
+IIOP::ListenPointList_var &
 IIOP::ListenPointList_var::operator= (ListenPointList *p)
 {
   delete this->ptr_;
@@ -429,8 +492,9 @@ IIOP::ListenPointList_var::operator= (ListenPointList *p)
   return *this;
 }
 
-ACE_INLINE IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // deep copy
+ACE_INLINE
+::IIOP::ListenPointList_var &
+IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p)
 {
   if (this != &p)
     {
@@ -441,12 +505,16 @@ IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // d
         }
       else
         {
-          IIOP::ListenPointList *deep_copy = 
-            new IIOP::ListenPointList (*p.ptr_);
+          ListenPointList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ListenPointList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::ListenPointList *tmp = deep_copy;
+              ListenPointList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -457,69 +525,75 @@ IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // d
   return *this;
 }
 
-ACE_INLINE const ::IIOP::ListenPointList *
+ACE_INLINE
+const ::IIOP::ListenPointList *
 IIOP::ListenPointList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator const ::IIOP::ListenPointList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint &
+ACE_INLINE
+IIOP::ListenPoint &
 IIOP::ListenPointList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IIOP::ListenPoint &
+ACE_INLINE
+const IIOP::ListenPoint &
 IIOP::ListenPointList_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const IIOP::ListenPoint &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::IIOP::ListenPointList &
+ACE_INLINE
+const ::IIOP::ListenPointList &
 IIOP::ListenPointList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList &
+ACE_INLINE
+::IIOP::ListenPointList &
 IIOP::ListenPointList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IIOP::ListenPointList *&
+ACE_INLINE
+::IIOP::ListenPointList *&
 IIOP::ListenPointList_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ IIOP::ListenPointList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_var::_retn (void)
 {
   ::IIOP::ListenPointList *tmp = this->ptr_;
@@ -535,12 +610,16 @@ IIOP::ListenPointList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class IIOP::ListenPointList_out
 // *************************************************************
@@ -553,7 +632,7 @@ IIOP::ListenPointList_out::ListenPointList_out (ListenPointList *&p)
 }
 
 ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p) // constructor from _var
+IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,57 +640,64 @@ IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p) // const
 }
 
 ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p) // copy constructor
+IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p)
   : ptr_ (ACE_const_cast (ListenPointList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IIOP::ListenPointList_out &
+ACE_INLINE
+::IIOP::ListenPointList_out &
 IIOP::ListenPointList_out::operator= (const ::IIOP::ListenPointList_out &p)
 {
   this->ptr_ = ACE_const_cast (ListenPointList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::IIOP::ListenPointList_out &
+ACE_INLINE
+::IIOP::ListenPointList_out &
 IIOP::ListenPointList_out::operator= (ListenPointList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_out::operator ::IIOP::ListenPointList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *&
+ACE_INLINE
+::IIOP::ListenPointList *&
 IIOP::ListenPointList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint &
+ACE_INLINE
+IIOP::ListenPoint &
 IIOP::ListenPointList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class IIOP::BiDirIIOPServiceContext_var
 // *************************************************************
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void) // default constructor
+IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void)
   : ptr_ (0)
 {}
 
@@ -621,46 +707,56 @@ IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (BiDirIIOPService
 {}
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p) // copy constructor
+IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void) // destructor
+IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *p)
+ACE_INLINE
+IIOP::BiDirIIOPServiceContext_var &
+IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &p)
+ACE_INLINE
+::IIOP::BiDirIIOPServiceContext_var &
+IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          IIOP::BiDirIIOPServiceContext *deep_copy = 
-            new IIOP::BiDirIIOPServiceContext (*p.ptr_);
+          BiDirIIOPServiceContext *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              BiDirIIOPServiceContext (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::BiDirIIOPServiceContext *tmp = deep_copy;
+              BiDirIIOPServiceContext *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -701,7 +797,7 @@ IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &()
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext *&() // cast 
 {
@@ -720,7 +816,7 @@ IIOP::BiDirIIOPServiceContext_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
 IIOP::BiDirIIOPServiceContext_var::out (void)
 {
@@ -743,6 +839,9 @@ IIOP::BiDirIIOPServiceContext_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class IIOP::BiDirIIOPServiceContext_out
 // *************************************************************
@@ -755,7 +854,7 @@ IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (::IIOP::BiDirIIO
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p) // constructor from _var
+IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -763,21 +862,23 @@ IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPService
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p) // copy constructor
+IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p)
   : ptr_ (ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_)
 {}
 
-ACE_INLINE IIOP::BiDirIIOPServiceContext_out &
+ACE_INLINE
+IIOP::BiDirIIOPServiceContext_out &
 IIOP::BiDirIIOPServiceContext_out::operator= (const ::IIOP::BiDirIIOPServiceContext_out &p)
 {
   this->ptr_ = ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IIOP::BiDirIIOPServiceContext_out &
-IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *p)
+ACE_INLINE
+IIOP::BiDirIIOPServiceContext_out &
+IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -799,30 +900,49 @@ IIOP::BiDirIIOPServiceContext_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::ListenPoint &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::ListenPoint &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.host.in ()) &&
     (strm << _tao_aggregate.port)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::ListenPoint &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::ListenPoint &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.host.out ()) &&
     (strm >> _tao_aggregate.port)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_I_
 #define _TAO_CDR_OP_IIOP_ListenPointList_I_
@@ -831,6 +951,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IIOP::ListenPointList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IIOP::ListenPointList &
@@ -838,25 +959,42 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::BiDirIIOPServiceContext &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.listen_points)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::BiDirIIOPServiceContext &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.listen_points)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 6ee802ec065..85f01ca47a2 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -86,7 +86,7 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
-TAO_IIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -107,7 +107,7 @@ TAO_IIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_IIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -159,7 +159,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -764,7 +764,7 @@ TAO_IIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index af914c9a7e1..266ca9f43ff 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -78,14 +78,14 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
 
   /**
    * Set the host name for the given addr.
@@ -143,13 +143,13 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 2702168bf3a..ffa727a675c 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -31,7 +31,7 @@ TAO_IIOP_Profile::object_key_delimiter (void) const
 
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (IOP::TAG_INTERNET_IOP, orb_core, version),
@@ -45,7 +45,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -293,7 +293,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
     }
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
 }
 
 CORBA::Boolean
@@ -377,8 +377,8 @@ char *
 TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
-                                            this->object_key_);
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
+                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
                   1 /* colon separator */ +
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 8b55bead27f..63cc8c5c7ee 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -53,7 +53,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
@@ -61,7 +61,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_IIOP_Profile (const char *host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_INET_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -112,11 +112,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @@ deprecated. return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -185,7 +185,7 @@ protected:
 private:
 
   /// object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
index b498170ce78..c6b0657e10e 100644
--- a/TAO/tao/IIOP_Profile.i
+++ b/TAO/tao/IIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_IIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_IIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 8e111dc8c94..c6278c09f30 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp
index 4e9eaeb6833..767c6acceae 100644
--- a/TAO/tao/IOPS.cpp
+++ b/TAO/tao/IOPS.cpp
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,9 +19,38 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+
+#ifndef _TAO_IDL_IOPS_CPP_
+#define _TAO_IDL_IOPS_CPP_
+
+
 #include "IOPS.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableInterceptor.h"
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/PICurrent.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+#include "ace/Dynamic_Service.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "IOPS.i"
 #endif /* !defined INLINE */
 
+
+#endif /* ifndef */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index a7318d979c8..ac5490b9b0f 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,17 +19,25 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
+
 #ifndef _TAO_IDL_IOPS_H_
 #define _TAO_IDL_IOPS_H_
 
-#include "ace/pre.h"
-#include "IOPC.h"
 
+#include "IOPC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -37,10 +45,25 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_IOP
 {
+  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
 }
-TAO_NAMESPACE_CLOSE
+TAO_NAMESPACE_CLOSE // module IOP
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "IOPS_T.h"
 
@@ -52,5 +75,8 @@ TAO_NAMESPACE_CLOSE
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #endif /* ifndef */
diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i
index 9d1a42dd508..e86a7e25a26 100644
--- a/TAO/tao/IOPS.i
+++ b/TAO/tao/IOPS.i
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
index e67a27b837d..893f7801e9e 100644
--- a/TAO/tao/IOPS_T.cpp
+++ b/TAO/tao/IOPS_T.cpp
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+
 #ifndef _TAO_IDL_IOPS_T_CPP_
 #define _TAO_IDL_IOPS_T_CPP_
 
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index 99d140830b8..b5ab3b15f34 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,10 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
+
 #ifndef _TAO_IDL_IOPS_T_H_
 #define _TAO_IDL_IOPS_T_H_
 
-#include "ace/pre.h"
+
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -31,16 +35,27 @@
 #endif /* _MSC_VER */
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
+#if defined (ACE_HAS_USING_KEYWORD)
+TAO_NAMESPACE  POA_IOP
+{
+}
+TAO_NAMESPACE_CLOSE // module IOP
+#endif /* ACE_HAS_USING_KEYWORD */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "IOPS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "IOPS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("IOPS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
@@ -49,5 +64,4 @@
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
index 9d1a42dd508..e86a7e25a26 100644
--- a/TAO/tao/IOPS_T.i
+++ b/TAO/tao/IOPS_T.i
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f5a34bc3a93..8daefb2369b 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -53,14 +53,14 @@ TAO_Table_Adapter::priority (void) const
 }
 
 int
-TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
+TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              TAO_ServerRequest &,
                              CORBA::Object_out forward_to
                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
-  TAO_ObjectKey::encode_sequence_to_string (object_key.out (),
+  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
                                             key);
   ACE_TRY
     {
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 40f87cc5b12..350e0bc5cf0 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -43,7 +43,7 @@ public:
   virtual void check_close (int wait_for_completion
                             ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
                         ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 15c457efb0d..864e84d742c 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -66,7 +66,7 @@ CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj
 // TAO's extensions
 
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 CORBA_LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ERROR((LM_ERROR,
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 7988c150ed5..e62b99ef2da 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -167,7 +167,7 @@ public:
   // = TAO extensions
 
   /// Throws CORBA::NO_IMPLEMENT.
-  virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   /// Useful for template programming.
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 5a2262d45b3..aaa3b727093 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -9,9 +9,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Messaging_PolicyValue.pidl
@@ -50,6 +50,4 @@ module Messaging
   const IOP::ServiceId INVOCATION_POLICIES = 2;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_MESSAGING_POLICYVALUE_PIDL */
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 4c555103fc7..08ae2f16e94 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_PolicyValueC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Messaging_PolicyValueC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,9 +44,12 @@
 #include "Messaging_PolicyValueC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -53,15 +61,15 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
   ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-  12,
+    12,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
-  6,
+    6,
   ACE_NTOHL (0x70747970), 
   ACE_NTOHL (0x65000000),  // name = ptype
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -74,17 +82,17 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
     ACE_NTOHL (0x54797065), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-    11,
+        11,
     ACE_NTOHL (0x506f6c69), 
     ACE_NTOHL (0x63795479), 
     ACE_NTOHL (0x70650000),  // name = PolicyType
-    CORBA::tk_ulong,
+        CORBA::tk_ulong,
 
 
   7,
   ACE_NTOHL (0x7076616c), 
   ACE_NTOHL (0x75650000),  // name = pvalue
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -103,63 +111,89 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyValue, &_tc_TAO_tc_Messaging_PolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyValue,
+    &_tc_TAO_tc_Messaging_PolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyValue *tmp = ACE_static_cast (PolicyValue*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_)
 #define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Messaging::PolicyValue::_tao_seq_Octet
 // *************************************************************
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+
 void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -173,16 +207,21 @@ Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_allocate_buffer (C
   tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-    
-    if (this->release_)
-      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
-    
-  }
+    {
+      Messaging::PolicyValue *old =
+        ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -190,75 +229,96 @@ void
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
+    {
+      return;
+    }
   
+  Messaging::PolicyValue *tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
 #define _MESSAGING_POLICYVALUESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Messaging::PolicyValueSeq
 // *************************************************************
 
 Messaging::PolicyValueSeq::PolicyValueSeq (void)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
+
+Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
+
+Messaging::PolicyValueSeq::PolicyValueSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Messaging::PolicyValue *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
+
+Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
 {}
+
 void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyValueSeq *tmp = ACE_static_cast (PolicyValueSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -271,12 +331,12 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
   ACE_NTOHL (0x65536571), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
-  15,
+    15,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756553), 
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -293,15 +353,15 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
       ACE_NTOHL (0x56616c75), 
       ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-      12,
+            12,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63795661), 
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
-      6,
+            6,
       ACE_NTOHL (0x70747970), 
       ACE_NTOHL (0x65000000),  // name = ptype
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -314,17 +374,17 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
         ACE_NTOHL (0x54797065), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-        11,
+                11,
         ACE_NTOHL (0x506f6c69), 
         ACE_NTOHL (0x63795479), 
         ACE_NTOHL (0x70650000),  // name = PolicyType
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       7,
       ACE_NTOHL (0x7076616c), 
       ACE_NTOHL (0x75650000),  // name = pvalue
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -346,20 +406,15 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyValueSeq, &_tc_TAO_tc_Messaging_PolicyValueSeq)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyValueSeq,
+    &_tc_TAO_tc_Messaging_PolicyValueSeq
+  )
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -367,16 +422,12 @@ void operator<<= (
     const Messaging::PolicyValue &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValue,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
+      _tao_any,
+      Messaging::PolicyValue::_tao_any_destructor,
+      Messaging::_tc_PolicyValue,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -385,19 +436,12 @@ void operator<<= (
     Messaging::PolicyValue *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValue,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::PolicyValue::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
+      _tao_any,
+      Messaging::PolicyValue::_tao_any_destructor,
+      Messaging::_tc_PolicyValue,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -418,76 +462,24 @@ CORBA::Boolean operator>>= (
     const Messaging::PolicyValue *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_PolicyValue
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Messaging::PolicyValue*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::PolicyValue *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::PolicyValue,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_PolicyValue,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::PolicyValue::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
+        _tao_any,
+        Messaging::PolicyValue::_tao_any_destructor,
+        Messaging::_tc_PolicyValue,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Messaging::PolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -495,16 +487,12 @@ void operator<<= (
     const Messaging::PolicyValueSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValueSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
+      _tao_any,
+      Messaging::PolicyValueSeq::_tao_any_destructor,
+      Messaging::_tc_PolicyValueSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -513,19 +501,12 @@ void operator<<= (
     Messaging::PolicyValueSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValueSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::PolicyValueSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
+      _tao_any,
+      Messaging::PolicyValueSeq::_tao_any_destructor,
+      Messaging::_tc_PolicyValueSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -534,8 +515,8 @@ CORBA::Boolean operator>>= (
     Messaging::PolicyValueSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Messaging::PolicyValueSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const Messaging::PolicyValueSeq *&,
       _tao_elem
     );
 }
@@ -546,73 +527,17 @@ CORBA::Boolean operator>>= (
     const Messaging::PolicyValueSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_PolicyValueSeq
-          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 Messaging::PolicyValueSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::PolicyValueSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::PolicyValueSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_PolicyValueSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::PolicyValueSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
+        _tao_any,
+        Messaging::PolicyValueSeq::_tao_any_destructor,
+        Messaging::_tc_PolicyValueSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
@@ -622,26 +547,29 @@ CORBA::Boolean operator<< (
     const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-    
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -650,64 +578,81 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Messaging::PolicyValueSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -716,26 +661,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index d00e33a7a3b..24af31cc50a 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_MESSAGING_POLICYVALUEC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
+#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -56,51 +59,64 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Messaging
 {
-  struct PolicyValue;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class PolicyValue_var;
   
   struct TAO_Export PolicyValue
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyValue_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     
+
 #if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_)
 #define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_Octet;
     
     // *************************************************************
-    // _tao_seq_Octet
+    // Messaging::PolicyValue::_tao_seq_Octet
     // *************************************************************
     
     class TAO_Export _tao_seq_Octet : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
+      _tao_seq_Octet (void);
+      _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
+      _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
+      
       static void _tao_any_destructor (void*);
       
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -108,20 +124,20 @@ TAO_NAMESPACE  Messaging
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _pvalue_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_Octet pvalue;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export PolicyValue_var
   {
   public:
@@ -138,6 +154,7 @@ TAO_NAMESPACE  Messaging
     operator const PolicyValue &() const;
     operator PolicyValue &();
     operator PolicyValue &() const;
+    
     // Variable-size types only.
     operator PolicyValue *&();
     
@@ -152,6 +169,9 @@ TAO_NAMESPACE  Messaging
     PolicyValue *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export PolicyValue_out
   {
   public:
@@ -170,19 +190,23 @@ TAO_NAMESPACE  Messaging
     void operator= (const PolicyValue_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue;
   
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
+  class TAO_Export _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void);
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
@@ -219,55 +243,61 @@ TAO_NAMESPACE  Messaging
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
 #define _MESSAGING_POLICYVALUESEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyValueSeq;
   class PolicyValueSeq_var;
   
   // *************************************************************
-  // PolicyValueSeq
+  // Messaging::PolicyValueSeq
   // *************************************************************
   
   class TAO_Export PolicyValueSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyValueSeq (void); // default ctor
-    PolicyValueSeq (CORBA::ULong max); // uses max size
+    PolicyValueSeq (void);
+    PolicyValueSeq (CORBA::ULong max);
     PolicyValueSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         PolicyValue *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyValueSeq (const PolicyValueSeq &); // copy ctor
+    PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyValueSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ___VAR_CH_)
 #define _MESSAGING_POLICYVALUESEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class Messaging::PolicyValueSeq_var
   // *************************************************************
@@ -288,7 +318,9 @@ TAO_NAMESPACE  Messaging
     operator const PolicyValueSeq &() const;
     operator PolicyValueSeq &();
     operator PolicyValueSeq &() const;
-    operator PolicyValueSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator PolicyValueSeq *&();
     
     PolicyValue & operator[] (CORBA::ULong index);
     const PolicyValue & operator[] (CORBA::ULong index) const;
@@ -303,14 +335,15 @@ TAO_NAMESPACE  Messaging
   private:
     PolicyValueSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ___OUT_CH_)
 #define _MESSAGING_POLICYVALUESEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyValueSeq_out
   {
   public:
@@ -329,34 +362,60 @@ TAO_NAMESPACE  Messaging
     // Assignment from T_var not allowed.
     void operator= (const PolicyValueSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValueSeq;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
+  const CORBA::ULong TAG_POLICIES = 2U;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::ULong INVOCATION_POLICIES = 2U;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
 
@@ -371,6 +430,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
 #define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
@@ -386,9 +447,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_PolicyValueC.i"
@@ -404,3 +469,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i
index 4a4514a8cc8..331ec91b760 100644
--- a/TAO/tao/Messaging_PolicyValueC.i
+++ b/TAO/tao/Messaging_PolicyValueC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValue_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (void) // default constructor
+Messaging::PolicyValue_var::PolicyValue_var (void)
   : ptr_ (0)
 {}
 
@@ -34,42 +38,52 @@ Messaging::PolicyValue_var::PolicyValue_var (PolicyValue *p)
 {}
 
 ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p) // copy constructor
+Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Messaging::PolicyValue_var::~PolicyValue_var (void) // destructor
+Messaging::PolicyValue_var::~PolicyValue_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (PolicyValue *p)
+ACE_INLINE
+Messaging::PolicyValue_var &
+Messaging::PolicyValue_var::operator= (PolicyValue *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &p)
+ACE_INLINE
+::Messaging::PolicyValue_var &
+Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          PolicyValue *deep_copy =
-            new PolicyValue (*p.ptr_);
+          PolicyValue *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyValue (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -114,7 +128,7 @@ Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Messaging::PolicyValue_var::operator ::Messaging::PolicyValue *&() // cast 
 {
@@ -133,7 +147,7 @@ Messaging::PolicyValue_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::Messaging::PolicyValue *&
 Messaging::PolicyValue_var::out (void)
 {
@@ -156,6 +170,9 @@ Messaging::PolicyValue_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValue_out
 // *************************************************************
@@ -168,7 +185,7 @@ Messaging::PolicyValue_out::PolicyValue_out (::Messaging::PolicyValue *&p)
 }
 
 ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) // constructor from _var
+Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) // constructor
 }
 
 ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p) // copy constructor
+Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p)
   : ptr_ (ACE_const_cast (PolicyValue_out&, p).ptr_)
 {}
 
-ACE_INLINE Messaging::PolicyValue_out &
+ACE_INLINE
+Messaging::PolicyValue_out &
 Messaging::PolicyValue_out::operator= (const ::Messaging::PolicyValue_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyValue_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (PolicyValue *p)
+ACE_INLINE
+Messaging::PolicyValue_out &
+Messaging::PolicyValue_out::operator= (PolicyValue *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ Messaging::PolicyValue_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_
 
-// = Static operations.
-ACE_INLINE Messaging::PolicyValue *
+ACE_INLINE
+Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   Messaging::PolicyValue *retval = 0;
   ACE_NEW_RETURN (retval, Messaging::PolicyValue[size], 0);
   return retval;
 }
 
-ACE_INLINE void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer)
-// Free the sequence.
+ACE_INLINE
+void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Default constructor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  Messaging::PolicyValue *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    Messaging::PolicyValue *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs)
-// Copy constructor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
+    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    Messaging::PolicyValue *tmp1 = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_);
-    Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      Messaging::PolicyValue *tmp1 =
+        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_);
+      Messaging::PolicyValue * const tmp2 =
+        ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (
+    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          Messaging::PolicyValue *tmp =
+            ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  Messaging::PolicyValue *tmp1 = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-  Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
+  Messaging::PolicyValue *tmp1 =
+    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+  Messaging::PolicyValue * const tmp2 =
+    ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue* tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
+  Messaging::PolicyValue* tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const Messaging::PolicyValue &
+ACE_INLINE
+const Messaging::PolicyValue &
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue * const tmp = ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_);
+  Messaging::PolicyValue * const tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE Messaging::PolicyValue *
+ACE_INLINE
+Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (CORBA::Boolean orphan)
 {
   Messaging::PolicyValue *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const Messaging::PolicyValue *
+ACE_INLINE
+const Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-Messaging::PolicyValue *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Messaging::PolicyValue *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    Messaging::PolicyValue *tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-  }
+    {
+      Messaging::PolicyValue *tmp =
+        ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CI_)
 #define _MESSAGING_POLICYVALUESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValueSeq_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor
+Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ Messaging::PolicyValueSeq_var::PolicyValueSeq_var (PolicyValueSeq *p)
 {}
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p) // copy constructor
+Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor
+Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValueSeq_var &
+ACE_INLINE
+Messaging::PolicyValueSeq_var &
 Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p)
 {
   delete this->ptr_;
@@ -429,7 +492,8 @@ Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p)
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq_var &
+ACE_INLINE
+::Messaging::PolicyValueSeq_var &
 Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p)
 {
   if (this != &p)
@@ -441,8 +505,12 @@ Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var
         }
       else
         {
-          PolicyValueSeq *deep_copy =
-            new PolicyValueSeq (*p.ptr_);
+          PolicyValueSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyValueSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -457,69 +525,75 @@ Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var
   return *this;
 }
 
-ACE_INLINE const ::Messaging::PolicyValueSeq *
+ACE_INLINE
+const ::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator const ::Messaging::PolicyValueSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const Messaging::PolicyValue &
+ACE_INLINE
+const Messaging::PolicyValue &
 Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const Messaging::PolicyValue &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::Messaging::PolicyValueSeq &
+ACE_INLINE
+const ::Messaging::PolicyValueSeq &
 Messaging::PolicyValueSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq &
+ACE_INLINE
+::Messaging::PolicyValueSeq &
 Messaging::PolicyValueSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Messaging::PolicyValueSeq *&
+ACE_INLINE
+::Messaging::PolicyValueSeq *&
 Messaging::PolicyValueSeq_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ Messaging::PolicyValueSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::_retn (void)
 {
   ::Messaging::PolicyValueSeq *tmp = this->ptr_;
@@ -535,12 +610,16 @@ Messaging::PolicyValueSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValueSeq_out
 // *************************************************************
@@ -553,7 +632,7 @@ Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq *&p)
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) // constructor from _var
+Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,51 +640,57 @@ Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) // con
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p) // copy constructor
+Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p)
   : ptr_ (ACE_const_cast (PolicyValueSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Messaging::PolicyValueSeq_out &
+ACE_INLINE
+::Messaging::PolicyValueSeq_out &
 Messaging::PolicyValueSeq_out::operator= (const ::Messaging::PolicyValueSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyValueSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq_out &
+ACE_INLINE
+::Messaging::PolicyValueSeq_out &
 Messaging::PolicyValueSeq_out::operator= (PolicyValueSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *&
+ACE_INLINE
+::Messaging::PolicyValueSeq *&
 Messaging::PolicyValueSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_
@@ -614,6 +699,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Messaging::PolicyValue::_tao_seq_Octet &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Messaging::PolicyValue::_tao_seq_Octet &
@@ -621,30 +707,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PolicyValue &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const Messaging::PolicyValue &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.ptype) &&
     (strm << _tao_aggregate.pvalue)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    Messaging::PolicyValue &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.ptype) &&
     (strm >> _tao_aggregate.pvalue)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
 #define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
@@ -653,6 +758,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Messaging::PolicyValueSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Messaging::PolicyValueSeq &
diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl
index 5d22dddd296..d4abd8b816f 100644
--- a/TAO/tao/Messaging_SyncScope.pidl
+++ b/TAO/tao/Messaging_SyncScope.pidl
@@ -9,9 +9,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Gv
+ *        -o orig -Gp -Gd
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=corbafwd.h
+ *        -Wb,export_include=tao/corbafwd.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Messaging_SyncScope.pidl
@@ -44,6 +44,4 @@ module Messaging
   const SyncScope SYNC_WITH_TARGET    = 3;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_MESSAGING_SYNCSCOPE_PIDL */
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 3641e838993..119a8e51a86 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_SyncScopeC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Messaging_SyncScopeC.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -31,24 +34,27 @@
 #include "Messaging_SyncScopeC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_SyncScope[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5379),
-  ACE_NTOHL (0x6e635363),
-  ACE_NTOHL (0x6f70653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5379), 
+  ACE_NTOHL (0x6e635363), 
+  ACE_NTOHL (0x6f70653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/SyncScope:1.0
-  10,
-  ACE_NTOHL (0x53796e63),
-  ACE_NTOHL (0x53636f70),
+    10,
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
   ACE_NTOHL (0x65000000),  // name = SyncScope
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -62,22 +68,10 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScope (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_Messaging_SyncScope)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SyncScope,
+    &_tc_TAO_tc_Messaging_SyncScope
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
-TAO_NAMESPACE_END
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index a9f44b15b5e..2b4ed88e016 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -19,12 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -53,30 +56,61 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Messaging
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SyncScope;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_NONE = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_TRANSPORT = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_SERVER = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_TARGET = 3;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScopeC.i"
@@ -92,3 +126,4 @@ TAO_NAMESPACE_CLOSE // module Messaging
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging_SyncScopeC.i b/TAO/tao/Messaging_SyncScopeC.i
index 95f0b8ea192..e86a7e25a26 100644
--- a/TAO/tao/Messaging_SyncScopeC.i
+++ b/TAO/tao/Messaging_SyncScopeC.i
@@ -18,3 +18,5 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b4bfae387c7..4e220b9200b 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -211,7 +211,7 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj
 
 // TAO's extensions
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
@@ -230,7 +230,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
                     0);
 }
 
-const TAO_ObjectKey &
+const TAO::ObjectKey &
 CORBA::Object::_object_key (void)
 {
   return this->_stubobj ()->profile_in_use ()->object_key ();
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 6a025af48a5..a988b2b983f 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -28,6 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Policy_ForwardC.h"
+#include "tao/Object_KeyC.h"
 
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
@@ -194,14 +195,14 @@ public:
 
   /// Return the object key as an out parameter.  Caller should release
   /// return value when finished with it.
-  virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
    * Return a reference to the object key of profile in-use.
    * If there's no in-use profile, then the program will
    * probably crash.  This method does not create a new copy.
    */
-  virtual const TAO_ObjectKey &_object_key (void);
+  virtual const TAO::ObjectKey &_object_key (void);
 
   /// Downcasting this object pointer to some other derived class.
   /// This QueryInterface stuff only work for local object.
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/tao/ObjectIdList.pidl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/tao/ObjectReferenceTemplate.pidl b/TAO/tao/ObjectReferenceTemplate.pidl
index 70765a22e3b..037c785a0ea 100644
--- a/TAO/tao/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjectReferenceTemplate.pidl
@@ -11,9 +11,9 @@
  * using the following command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        ObjectReferenceTemplate.pidl
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index a76887bbc9f..e87fd7b9dc3 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectReferenceTemplateC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "ObjectReferenceTemplateC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -40,27 +43,30 @@
 #include "ObjectReferenceTemplateC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
-  9,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
+    9,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = ServerId
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -74,28 +80,35 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerId, &_tc_TAO_tc_PortableInterceptor_ServerId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerId,
+    &_tc_TAO_tc_PortableInterceptor_ServerId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
-  6,
-  ACE_NTOHL (0x4f524249),
+    6,
+  ACE_NTOHL (0x4f524249), 
   ACE_NTOHL (0x64000000),  // name = ORBId
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -109,49 +122,56 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ORBId, &_tc_TAO_tc_PortableInterceptor_ORBId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBId,
+    &_tc_TAO_tc_PortableInterceptor_ORBId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x616d653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x616d653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
-  12,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
+    12,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
   ACE_NTOHL (0x616d6500),  // name = AdapterName
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72696e67),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72696e67), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
-    ACE_NTOHL (0x53747269),
-    ACE_NTOHL (0x6e675365),
+        10,
+    ACE_NTOHL (0x53747269), 
+    ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       0U,
 
@@ -168,46 +188,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterName, &_tc_TAO_tc_PortableInterceptor_AdapterName)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterName,
+    &_tc_TAO_tc_PortableInterceptor_AdapterName
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
-  9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-    9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+        9,
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_octet,
@@ -227,40 +254,47 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableInterceptor_ObjectId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectId,
+    &_tc_TAO_tc_PortableInterceptor_ObjectId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
-  23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
+    23,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
-  2, // value modifier
+    2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  0, // member count
-};
+0, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
     CORBA::tk_value,
@@ -272,9 +306,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceFactory, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceFactory,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+
 void
 tao_PortableInterceptor_ObjectReferenceFactory_add_ref (
     PortableInterceptor::ObjectReferenceFactory *p
@@ -291,11 +332,14 @@ tao_PortableInterceptor_ObjectReferenceFactory_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceFactory_var
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void) // default constructor
+PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void)
   : ptr_ (0)
 {}
 
@@ -304,16 +348,16 @@ PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (Obj
 {}
 
 PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p))
+  : ptr_ (ACE_const_cast (ObjectReferenceFactory *, p))
 {}
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p)
 {
   CORBA::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
@@ -325,7 +369,7 @@ PortableInterceptor::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (vo
 }
 
 PortableInterceptor::ObjectReferenceFactory_var &
-PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory* p)
+PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory *p)
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = p;
@@ -338,10 +382,11 @@ PortableInterceptor::ObjectReferenceFactory_var::operator= (const ObjectReferenc
   if (this != &p)
   {
     CORBA::remove_ref (this->ptr_);
-    ObjectReferenceFactory* tmp = p.ptr ();
+    ObjectReferenceFactory *tmp = p.ptr ();
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
+  
   return *this;
 }
 
@@ -350,30 +395,30 @@ PortableInterceptor::ObjectReferenceFactory_var::operator const PortableIntercep
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast
+PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory*& () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::in (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_var::inout (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_var::out (void)
 {
   CORBA::remove_ref (this->ptr_);
@@ -381,7 +426,7 @@ PortableInterceptor::ObjectReferenceFactory_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -406,118 +451,125 @@ PortableInterceptor::ObjectReferenceFactory_var::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceFactory_out
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory* &p)
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_)
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p)
+  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_)
 {}
 
 PortableInterceptor::ObjectReferenceFactory_out &
 PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p)
 {
-  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceFactory_out &
 PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p)
 {
-  ObjectReferenceFactory* tmp = p.ptr ();
+  ObjectReferenceFactory *tmp = p.ptr ();
   CORBA::add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceFactory_out &
-PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory* p)
+PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory* &() // cast
+PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory*& () // cast
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase* v)
+// *************************************************************
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+
+PortableInterceptor::ObjectReferenceFactory *
+PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
 {
   if (v == 0)
     {
       return 0;
     }
-
-  return (ObjectReferenceFactory* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
+  
+  return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
-const char* PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id () const
+const char *
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const
 {
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
 void *
-PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
+#if defined (_MSC_VER)
+PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t type_id)
+#else
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 #endif /* _MSC_VER */
-
-void* PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR &)
+#if defined (_MSC_VER)
+void *
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 {
-  return 0;
+  return this->PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (type_id);
 }
+#endif /* _MSC_VER */
 
 void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceFactory *tmp = ACE_static_cast (ObjectReferenceFactory*, _tao_void_pointer);
+  ObjectReferenceFactory *tmp =
+    ACE_static_cast (
+        ObjectReferenceFactory *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
@@ -526,7 +578,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
     ObjectReferenceFactory *&new_object
   )
 {
-  CORBA::ValueBase *base;
+  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
@@ -535,63 +587,69 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-
-  if (retval == 0 || factory.in() == 0)
+  
+  if (retval == 0)
     {
       return 0;
     }
-
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
-    {
-      return 0;  // %! except.?
-    }
-
-  retval = base->_tao_unmarshal_v (strm);
-
-  if (retval == 0)
+  
+  if (factory.in () != 0)
     {
-      return 0;
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
   return retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-  24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-  2, // value modifier
+    2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  3, // member count
-};
+3, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
     CORBA::tk_value,
@@ -603,9 +661,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplate, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceTemplate,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+
 void
 tao_PortableInterceptor_ObjectReferenceTemplate_add_ref (
     PortableInterceptor::ObjectReferenceTemplate *p
@@ -622,11 +687,14 @@ tao_PortableInterceptor_ObjectReferenceTemplate_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceTemplate_var
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void) // default constructor
+PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void)
   : ptr_ (0)
 {}
 
@@ -635,16 +703,16 @@ PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (O
 {}
 
 PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p))
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p))
 {}
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p)
 {
   CORBA::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
@@ -656,7 +724,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (
 }
 
 PortableInterceptor::ObjectReferenceTemplate_var &
-PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate* p)
+PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p)
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = p;
@@ -669,10 +737,11 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator= (const ObjectReferen
   if (this != &p)
   {
     CORBA::remove_ref (this->ptr_);
-    ObjectReferenceTemplate* tmp = p.ptr ();
+    ObjectReferenceTemplate *tmp = p.ptr ();
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
+  
   return *this;
 }
 
@@ -681,30 +750,30 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterce
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast
+PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::in (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_var::inout (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_var::out (void)
 {
   CORBA::remove_ref (this->ptr_);
@@ -712,7 +781,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -737,101 +806,106 @@ PortableInterceptor::ObjectReferenceTemplate_var::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceTemplate_out
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate* &p)
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p)
   : ptr_ (p.out ())
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_)
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p)
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_)
 {}
 
 PortableInterceptor::ObjectReferenceTemplate_out &
 PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p)
 {
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceTemplate_out &
 PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p)
 {
-  ObjectReferenceTemplate* tmp = p.ptr ();
+  ObjectReferenceTemplate *tmp = p.ptr ();
   CORBA::add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceTemplate_out &
-PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate* p)
+PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate* &() // cast
+PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase* v)
+// *************************************************************
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+
+PortableInterceptor::ObjectReferenceTemplate *
+PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
 {
   if (v == 0)
     {
       return 0;
     }
-
-  return (ObjectReferenceTemplate* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
+  
+  return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
-const char* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id () const
+const char *
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
 {
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
 void *
-PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
+#if defined (_MSC_VER)
+PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id)
+#else
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 #endif /* _MSC_VER */
-
-void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -840,24 +914,26 @@ void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t
       rval = this->PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-
+  
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR &)
+#if defined (_MSC_VER)
+void *
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 {
-  return 0;
+  return this->PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (type_id);
 }
+#endif /* _MSC_VER */
 
 void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceTemplate *tmp = ACE_static_cast (ObjectReferenceTemplate*, _tao_void_pointer);
+  ObjectReferenceTemplate *tmp =
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
@@ -866,7 +942,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
     ObjectReferenceTemplate *&new_object
   )
 {
-  CORBA::ValueBase *base;
+  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
@@ -875,32 +951,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
-  if (retval == 0 || factory.in () == 0)
+  
+  if (retval == 0)
     {
       return 0;
     }
-
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
-    {
-      return 0;  // %! except.?
-    }
-
-  retval = base->_tao_unmarshal_v (strm);
-
-  if (retval == 0)
+  
+  if (factory.in () != 0)
     {
-      return 0;
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -913,29 +994,30 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = 0;
   tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            if (old[i] != 0)
-              old[i]->_add_ref ();
-            tmp[i] = old[i];
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              CORBA::add_ref (old[i]);
+              tmp[i] = old[i];
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -943,16 +1025,18 @@ void
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
+      CORBA::remove_ref (tmp[i]);
       tmp[i] = 0;
     }
-
+  
   _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -966,97 +1050,117 @@ void
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
+      CORBA::remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
 
 
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // PortableInterceptor::ObjectReferenceTemplateSeq
 // *************************************************************
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max) // uses max size
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max, CORBA::ULong length, PortableInterceptor::ObjectReferenceTemplate_ptr *buffer, CORBA::Boolean release)
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    PortableInterceptor::ObjectReferenceTemplate_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq) // copy ctor
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor
 {}
+
 void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplateSeq *tmp = ACE_static_cast (ObjectReferenceTemplateSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
-  27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
+    27,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_value, // typecode kind
@@ -1078,18 +1182,18 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
       ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x6174653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-      24,
+            24,
       ACE_NTOHL (0x4f626a65), 
       ACE_NTOHL (0x63745265), 
       ACE_NTOHL (0x66657265), 
       ACE_NTOHL (0x6e636554), 
       ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-      2, // value modifier
+            2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
-      3, // member count
-
+3, // member count
+      
     0U,
 
 };
@@ -1104,12 +1208,19 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplateSeq, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceTemplateSeq,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   53,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1125,13 +1236,13 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
   ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
-  17,
+    17,
   ACE_NTOHL (0x41646170), 
   ACE_NTOHL (0x7465724d), 
   ACE_NTOHL (0x616e6167), 
   ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = AdapterManagerId
-  CORBA::tk_long,
+    CORBA::tk_long,
 
 };
 
@@ -1145,12 +1256,19 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterManagerId, &_tc_TAO_tc_PortableInterceptor_AdapterManagerId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterManagerId,
+    &_tc_TAO_tc_PortableInterceptor_AdapterManagerId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   49,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1165,12 +1283,12 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
   ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
-  13,
+    13,
   ACE_NTOHL (0x41646170), 
   ACE_NTOHL (0x74657253), 
   ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x0),  // name = AdapterState
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -1184,206 +1302,121 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterState, &_tc_TAO_tc_PortableInterceptor_AdapterState)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterState,
+    &_tc_TAO_tc_PortableInterceptor_AdapterState
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, HOLDING, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ACTIVE, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, DISCARDING, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, INACTIVE, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NON_EXISTENT, 4)
-TAO_NAMESPACE_END
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *value) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory **value) // non-copying
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory **_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << *value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        *value,
-        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor);
-  }
+  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceFactory,
+      *_tao_elem
+    );
 }
 
-TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *&value)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-    {
-      return 0; // not equivalent
-    }
-    if (any.any_owns_data ())
-    {
-      const PortableInterceptor::ObjectReferenceFactory *const_holder = ACE_static_cast (
-          const PortableInterceptor::ObjectReferenceFactory*,
-          any.value ());
-      value = ACE_const_cast (
-          PortableInterceptor::ObjectReferenceFactory*,
-          const_holder);
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ObjectReferenceFactory *tmp;
-      TAO_InputCDR stream (
-          any._tao_get_cdr (),
-          any._tao_byte_order ());
-      if (stream >> tmp)
-      {
-        ((CORBA::Any *)&any)->_tao_replace (
-            PortableInterceptor::_tc_ObjectReferenceFactory,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor);
-        value = tmp;
-        return 1;
-      }
-      
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceFactory,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>
+  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>
+#  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *value) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate **value) // non-copying
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate **_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << *value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        *value,
-        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor);
-  }
+  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
 }
 
-TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *&value)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplate ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-    {
-      return 0; // not equivalent
-    }
-    if (any.any_owns_data ())
-    {
-      const PortableInterceptor::ObjectReferenceTemplate *const_holder = ACE_static_cast (
-          const PortableInterceptor::ObjectReferenceTemplate*,
-          any.value ());
-      value = ACE_const_cast (
-          PortableInterceptor::ObjectReferenceTemplate*,
-          const_holder);
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ObjectReferenceTemplate *tmp;
-      TAO_InputCDR stream (
-          any._tao_get_cdr (),
-          any._tao_byte_order ());
-      if (stream >> tmp)
-      {
-        ((CORBA::Any *)&any)->_tao_replace (
-            PortableInterceptor::_tc_ObjectReferenceTemplate,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor);
-        value = tmp;
-        return 1;
-      }
-      
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+#  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1391,16 +1424,12 @@ void operator<<= (
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -1409,19 +1438,12 @@ void operator<<= (
     PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -1430,8 +1452,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::ObjectReferenceTemplateSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::ObjectReferenceTemplateSeq *&,
       _tao_elem
     );
 }
@@ -1442,157 +1464,143 @@ CORBA::Boolean operator>>= (
     const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq
-          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 PortableInterceptor::ObjectReferenceTemplateSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        PortableInterceptor::ObjectReferenceTemplateSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            PortableInterceptor::ObjectReferenceTemplateSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+        _tao_elem
+      );
 }
 
-//@@ Boris: begin experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 {
   if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
+    {
+      vt->_add_ref ();
+    }
 }
 
 void
 CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 {
   if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
+    {
+      vt->_remove_ref ();
+    }
 }
 
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
 CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype)
+operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype
+  )
 {
-  return CORBA_ValueBase::_tao_marshal (strm,
-    ACE_const_cast (PortableInterceptor::ObjectReferenceFactory*, _tao_valuetype),
-    (ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast);
+  return
+    CORBA_ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceFactory *,
+            _tao_valuetype
+          ),
+        (ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast
+      );
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, PortableInterceptor::ObjectReferenceFactory *&_tao_valuetype)
+operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ObjectReferenceFactory *&_tao_valuetype
+  )
 {
   return PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (strm, _tao_valuetype);
 }
 
-//@@ Boris: begin experimental
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
+    {
+      vt->_add_ref ();
+    }
 }
 
 void
 CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
+    {
+      vt->_remove_ref ();
+    }
 }
 
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
 CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype)
+operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype
+  )
 {
-  return CORBA_ValueBase::_tao_marshal (strm,
-    ACE_const_cast (PortableInterceptor::ObjectReferenceTemplate*, _tao_valuetype),
-    (ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast);
+  return
+    CORBA_ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceTemplate *,
+            _tao_valuetype
+          ),
+        (ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast
+      );
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, PortableInterceptor::ObjectReferenceTemplate *&_tao_valuetype)
+operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ObjectReferenceTemplate *&_tao_valuetype
+  )
 {
   return PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1601,26 +1609,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index 5737082b16f..d7923f9d306 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
-#define _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
+#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -58,80 +61,117 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableInterceptor
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
   
-  // Valuetype class
-  class ObjectReferenceFactory;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
   
+  class ObjectReferenceFactory;
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_
   
   typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
   class TAO_Export ObjectReferenceFactory_var
   {
   public:
-    ObjectReferenceFactory_var (void); // default constructor
+    ObjectReferenceFactory_var (void);
     ObjectReferenceFactory_var (ObjectReferenceFactory*);
     ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension)
-    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); // copy constructor
-    ~ObjectReferenceFactory_var (void); // destructor
+    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &);
+    ~ObjectReferenceFactory_var (void);
     
     ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*);
     ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &);
     ObjectReferenceFactory* operator-> (void) const;
     
     operator const ObjectReferenceFactory* () const;
-    operator ObjectReferenceFactory* ();
+    operator ObjectReferenceFactory*& ();
     // in, inout, out, _retn 
     ObjectReferenceFactory* in (void) const;
-    ObjectReferenceFactory* &inout (void);
-    ObjectReferenceFactory* &out (void);
+    ObjectReferenceFactory*& inout (void);
+    ObjectReferenceFactory*& out (void);
     ObjectReferenceFactory* _retn (void);
     ObjectReferenceFactory* ptr (void) const;
-  
+    
     // Hooks used by template sequence and valuetype manager classes
     // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceFactory *);
     static void tao_remove_ref (ObjectReferenceFactory *);
-
+  
   private:
     ObjectReferenceFactory* ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
   class TAO_Export ObjectReferenceFactory_out
   {
   public:
@@ -141,18 +181,19 @@ TAO_NAMESPACE  PortableInterceptor
     ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &);
     ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &);
     ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*);
-    operator ObjectReferenceFactory* &();
-    ObjectReferenceFactory* &ptr (void);
+    operator ObjectReferenceFactory*& ();
+    ObjectReferenceFactory*& ptr (void);
     ObjectReferenceFactory* operator-> (void);
     
   private:
     ObjectReferenceFactory* &ptr_;
   };
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
   
@@ -160,12 +201,7 @@ TAO_NAMESPACE  PortableInterceptor
     : public virtual CORBA_ValueBase
   {
   public:
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceFactory* _ptr_type;
     typedef ObjectReferenceFactory_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase* );
     // The address of static _downcast is implicit used as type id
 
@@ -174,399 +210,486 @@ TAO_NAMESPACE  PortableInterceptor
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-    virtual const char* _tao_obv_repository_id () const;
-    static const char* _tao_obv_static_repository_id ();
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
     
     static void _tao_any_destructor (void *);
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
     virtual CORBA::Object_ptr make_object (
         const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-protected:
-  ObjectReferenceFactory ();
-  virtual ~ObjectReferenceFactory ();
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+  
+  protected:
+    ObjectReferenceFactory (void);
+    virtual ~ObjectReferenceFactory (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceFactory (const ObjectReferenceFactory &);
-  void operator= (const ObjectReferenceFactory &);
-  
-};
+    
+  private:
+    ObjectReferenceFactory (const ObjectReferenceFactory &);
+    void operator= (const ObjectReferenceFactory &);
+    
+  };
 
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
-// Valuetype class
-class ObjectReferenceTemplate;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  
+  class ObjectReferenceTemplate;
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_
-
-typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
+  
+  typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_
-
-class TAO_Export ObjectReferenceTemplate_var
-{
-public:
-  ObjectReferenceTemplate_var (void); // default constructor
-  ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
-  ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-  ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor
-  ~ObjectReferenceTemplate_var (void); // destructor
-  
-  ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
-  ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate* operator-> (void) const;
-  
-  operator const ObjectReferenceTemplate* () const;
-  operator ObjectReferenceTemplate* ();
-  // in, inout, out, _retn 
-  ObjectReferenceTemplate* in (void) const;
-  ObjectReferenceTemplate* &inout (void);
-  ObjectReferenceTemplate* &out (void);
-  ObjectReferenceTemplate* _retn (void);
-  ObjectReferenceTemplate* ptr (void) const;
-  
-  // Hooks used by template sequence and valuetype manager classes
-  // for non-defined forward declared valuetypes.
-  static void tao_add_ref (ObjectReferenceTemplate *);
-  static void tao_remove_ref (ObjectReferenceTemplate *);
-
-private:
-  ObjectReferenceTemplate* ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
+  class TAO_Export ObjectReferenceTemplate_var
+  {
+  public:
+    ObjectReferenceTemplate_var (void);
+    ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
+    ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
+    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
+    ~ObjectReferenceTemplate_var (void);
+    
+    ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
+    ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate* operator-> (void) const;
+    
+    operator const ObjectReferenceTemplate* () const;
+    operator ObjectReferenceTemplate*& ();
+    // in, inout, out, _retn 
+    ObjectReferenceTemplate* in (void) const;
+    ObjectReferenceTemplate*& inout (void);
+    ObjectReferenceTemplate*& out (void);
+    ObjectReferenceTemplate* _retn (void);
+    ObjectReferenceTemplate* ptr (void) const;
+    
+    // Hooks used by template sequence and valuetype manager classes
+    // for non-defined forward declared valuetypes.
+    static void tao_add_ref (ObjectReferenceTemplate *);
+    static void tao_remove_ref (ObjectReferenceTemplate *);
+  
+  private:
+    ObjectReferenceTemplate* ptr_;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_
-
-class TAO_Export ObjectReferenceTemplate_out
-{
-public:
-  ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
-  ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
-  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
-  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-  operator ObjectReferenceTemplate* &();
-  ObjectReferenceTemplate* &ptr (void);
-  ObjectReferenceTemplate* operator-> (void);
-  
-private:
-  ObjectReferenceTemplate* &ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
+  class TAO_Export ObjectReferenceTemplate_out
+  {
+  public:
+    ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
+    ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
+    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
+    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
+    operator ObjectReferenceTemplate*& ();
+    ObjectReferenceTemplate*& ptr (void);
+    ObjectReferenceTemplate* operator-> (void);
+    
+  private:
+    ObjectReferenceTemplate* &ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
+  
+  class TAO_Export ObjectReferenceTemplate
+    : public virtual ObjectReferenceFactory
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+    // The address of static _downcast is implicit used as type id
 
-class TAO_Export ObjectReferenceTemplate
-  : public virtual ObjectReferenceFactory
-{
-public:
-  
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ObjectReferenceTemplate* _ptr_type;
-  typedef ObjectReferenceTemplate_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-  
-  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
-  // The address of static _downcast is implicit used as type id
-
-  // (TAO extensions or internals)
-  static CORBA::Boolean _tao_unmarshal (
-      TAO_InputCDR &,
-      ObjectReferenceTemplate *&
-    );
-  virtual const char* _tao_obv_repository_id () const;
-  static const char* _tao_obv_static_repository_id ();
-  
-  static void _tao_any_destructor (void *);
-  
-  virtual char * server_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) = 0;
-virtual char * orb_id (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  ) = 0;
-virtual ::PortableInterceptor::AdapterName * adapter_name (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  ) = 0;
-
-protected:
-  ObjectReferenceTemplate ();
-  virtual ~ObjectReferenceTemplate ();
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual char * server_id (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual char * orb_id (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual ::PortableInterceptor::AdapterName * adapter_name (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-  void operator= (const ObjectReferenceTemplate &);
-  
-};
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  };
 
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-
-class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-  : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-      CORBA::ULong maximum,
-      CORBA::ULong length,
-      ObjectReferenceTemplate* *value,
-      CORBA::Boolean release = 0
-    );
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-    );
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
-      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-    );
-  virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-  
-  // = Accessors.
-  TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
-  
-  // = Static operations.
-  static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
-  static void freebuf (ObjectReferenceTemplate **buffer);
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
-  const ObjectReferenceTemplate* *get_buffer (void) const;
-  virtual void _shrink_buffer (
-      CORBA::ULong nl,
-      CORBA::ULong ol
-    );
-  
-  
-};
+  
+  class TAO_Export _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ObjectReferenceTemplate* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+      );
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
+        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+    
+    // = Accessors.
+    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ObjectReferenceTemplate **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
+    const ObjectReferenceTemplate* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+  };
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ObjectReferenceTemplateSeq;
+  class ObjectReferenceTemplateSeq_var;
+  
+  // *************************************************************
+  // PortableInterceptor::ObjectReferenceTemplateSeq
+  // *************************************************************
+  
+  class TAO_Export ObjectReferenceTemplateSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-class ObjectReferenceTemplateSeq;
-class ObjectReferenceTemplateSeq_var;
-
-// *************************************************************
-// ObjectReferenceTemplateSeq
-// *************************************************************
-
-class TAO_Export ObjectReferenceTemplateSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
+  TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  ObjectReferenceTemplateSeq (void); // default ctor
-  ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size
-  ObjectReferenceTemplateSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ObjectReferenceTemplate_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
-  ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor
-  ~ObjectReferenceTemplateSeq (void);
-  static void _tao_any_destructor (void*);
-  
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ObjectReferenceTemplateSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-  
-  
-};
+  {
+  public:
+    ObjectReferenceTemplateSeq (void);
+    ObjectReferenceTemplateSeq (CORBA::ULong max);
+    ObjectReferenceTemplateSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ObjectReferenceTemplate_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
+    ~ObjectReferenceTemplateSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ObjectReferenceTemplateSeq_var _var_type;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_
-
-// *************************************************************
-// class PortableInterceptor::ObjectReferenceTemplateSeq_var
-// *************************************************************
-
-class TAO_Export ObjectReferenceTemplateSeq_var
-{
-public:
-  ObjectReferenceTemplateSeq_var (void);
-  ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
-  ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
-  ~ObjectReferenceTemplateSeq_var (void);
   
-  ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
-  ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
-  ObjectReferenceTemplateSeq *operator-> (void);
-  const ObjectReferenceTemplateSeq *operator-> (void) const;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
   
-  operator const ObjectReferenceTemplateSeq &() const;
-  operator ObjectReferenceTemplateSeq &();
-  operator ObjectReferenceTemplateSeq &() const;
-  operator ObjectReferenceTemplateSeq *&(); // variable-size base types only
+  // *************************************************************
+  // class PortableInterceptor::ObjectReferenceTemplateSeq_var
+  // *************************************************************
   
-  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+  class TAO_Export ObjectReferenceTemplateSeq_var
+  {
+  public:
+    ObjectReferenceTemplateSeq_var (void);
+    ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
+    ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
+    ~ObjectReferenceTemplateSeq_var (void);
+    
+    ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
+    ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
+    ObjectReferenceTemplateSeq *operator-> (void);
+    const ObjectReferenceTemplateSeq *operator-> (void) const;
+    
+    operator const ObjectReferenceTemplateSeq &() const;
+    operator ObjectReferenceTemplateSeq &();
+    operator ObjectReferenceTemplateSeq &() const;
+    
+    // Variable-size base types only.
+    operator ObjectReferenceTemplateSeq *&();
+    
+    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ObjectReferenceTemplateSeq &in (void) const;
+    ObjectReferenceTemplateSeq &inout (void);
+    ObjectReferenceTemplateSeq *&out (void);
+    ObjectReferenceTemplateSeq *_retn (void);
+    ObjectReferenceTemplateSeq *ptr (void) const;
   
-  // in, inout, out, _retn 
-  const ObjectReferenceTemplateSeq &in (void) const;
-  ObjectReferenceTemplateSeq &inout (void);
-  ObjectReferenceTemplateSeq *&out (void);
-  ObjectReferenceTemplateSeq *_retn (void);
-  ObjectReferenceTemplateSeq *ptr (void) const;
-
-private:
-  ObjectReferenceTemplateSeq *ptr_;
-};
-
+  private:
+    ObjectReferenceTemplateSeq *ptr_;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_
-
-class TAO_Export ObjectReferenceTemplateSeq_out
-{
-public:
-  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
-  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
-  ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
-  ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
-  ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
-  operator ObjectReferenceTemplateSeq *&();
-  ObjectReferenceTemplateSeq *&ptr (void);
-  ObjectReferenceTemplateSeq *operator-> (void);
-  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-
-private:
-  ObjectReferenceTemplateSeq *&ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const ObjectReferenceTemplateSeq_var &);
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export ObjectReferenceTemplateSeq_out
+  {
+  public:
+    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
+    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
+    ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
+    ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
+    ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
+    operator ObjectReferenceTemplateSeq *&();
+    ObjectReferenceTemplateSeq *&ptr (void);
+    ObjectReferenceTemplateSeq *operator-> (void);
+    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ObjectReferenceTemplateSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ObjectReferenceTemplateSeq_var &);
+  };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::Long AdapterManagerId;
+  typedef CORBA::Long_out AdapterManagerId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::Short AdapterState;
+  typedef CORBA::Short_out AdapterState_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short HOLDING = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ACTIVE = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short DISCARDING = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short INACTIVE = 3;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short NON_EXISTENT = 4;
 
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-
-typedef CORBA::Long AdapterManagerId;
-typedef CORBA::Long_out AdapterManagerId_out;
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-
-typedef CORBA::Short AdapterState;
-typedef CORBA::Short_out AdapterState_out;
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
+
 TAO_NAMESPACE  OBV_PortableInterceptor
 {
-}
-TAO_NAMESPACE_CLOSE
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
+
+}TAO_NAMESPACE_CLOSE
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-// Any operators for valuetype PortableInterceptor::ObjectReferenceFactory
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
-// Any operators for valuetype PortableInterceptor::ObjectReferenceTemplate
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
-//@@ Boris: begin experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceFactory *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
-//@@ Boris: begin experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 
@@ -581,9 +704,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.i"
@@ -599,3 +726,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjectReferenceTemplateC.i
index 2d6b01034f2..4593ce1a908 100644
--- a/TAO/tao/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjectReferenceTemplateC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+
 ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory () // default constructor
+PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory () // destructor
+PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
 {}
 
 ACE_INLINE const char* 
@@ -33,12 +37,15 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate () // default constructor
+PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate () // destructor
+PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
 ACE_INLINE const char* 
@@ -47,13 +54,16 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
 #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate **
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate **
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (CORBA::ULong nelems)
 {
   PortableInterceptor::ObjectReferenceTemplate **buf = 0;
@@ -68,11 +78,15 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (PortableInterceptor::ObjectReferenceTemplate **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -88,142 +102,178 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 }
 
 ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  PortableInterceptor::ObjectReferenceTemplate* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    PortableInterceptor::ObjectReferenceTemplate* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq(const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs)
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq(
+    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **tmp1 = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-    PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        if (tmp2[i] != 0)
-          tmp2[i]->_add_ref ();
-        tmp1[i] = tmp2 [i];
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      PortableInterceptor::ObjectReferenceTemplate **tmp1 =
+        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
+      PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
+        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          if (tmp2[i] != 0)
+            {
+              tmp2[i]->_add_ref ();
+            }
+          
+          tmp1[i] = tmp2 [i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= (const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs)
+ACE_INLINE
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= (
+    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
-      tmp[i] = 0;
+      PortableInterceptor::ObjectReferenceTemplate **tmp =
+        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (tmp[i] != 0)
+            {
+              tmp[i]->_remove_ref ();
+            }
+          
+          tmp[i] = 0;
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  PortableInterceptor::ObjectReferenceTemplate **tmp1 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
+  PortableInterceptor::ObjectReferenceTemplate **tmp1 =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
+  
+  PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
       if (tmp2[i] != 0)
-        tmp2[i]->_add_ref ();
+        {
+          tmp2[i]->_add_ref ();
+        }
+      
       tmp1[i] = tmp2 [i];
     }
   
   return *this;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
+  PortableInterceptor::ObjectReferenceTemplate ** const tmp =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
   return TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate* *
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate* *
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (CORBA::Boolean orphan)
 {
   PortableInterceptor::ObjectReferenceTemplate **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const PortableInterceptor::ObjectReferenceTemplate* *
+ACE_INLINE
+const PortableInterceptor::ObjectReferenceTemplate* *
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_var
 // *************************************************************
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void) // default constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -233,21 +283,26 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void) // destructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplateSeq_var &
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplateSeq_var &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceTemplateSeq *p)
 {
   delete this->ptr_;
@@ -255,7 +310,8 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceT
   return *this;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_var &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_var &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
 {
   if (this != &p)
@@ -267,8 +323,12 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::Portable
         }
       else
         {
-          ObjectReferenceTemplateSeq *deep_copy =
-            new ObjectReferenceTemplateSeq (*p.ptr_);
+          ObjectReferenceTemplateSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectReferenceTemplateSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -283,63 +343,68 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::Portable
   return *this;
 }
 
-ACE_INLINE const ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+const ::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator const ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::PortableInterceptor::ObjectReferenceTemplateSeq &
+ACE_INLINE
+const ::PortableInterceptor::ObjectReferenceTemplateSeq &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *&
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *&
 PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void)
 {
   delete this->ptr_;
@@ -347,7 +412,8 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void)
 {
   ::PortableInterceptor::ObjectReferenceTemplateSeq *tmp = this->ptr_;
@@ -355,12 +421,16 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_out
 // *************************************************************
@@ -373,7 +443,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -381,76 +451,98 @@ PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
   : ptr_ (ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_out &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_out &
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_out &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_out &
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (ObjectReferenceTemplateSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *&
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *&
 PortableInterceptor::ObjectReferenceTemplateSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+
 #if defined (__ACE_INLINE__)
-//@@ Boris: begin experimental
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceFactory *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
 #endif /*__ACE_INLINE__*/
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+
 #if defined (__ACE_INLINE__)
-//@@ Boris: begin experimental
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
 #endif /*__ACE_INLINE__*/
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 
@@ -458,6 +550,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const PortableInterceptor::ObjectReferenceTemplateSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     PortableInterceptor::ObjectReferenceTemplateSeq &
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 8d52f69c249..e7288e5b236 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -1,56 +1,143 @@
+// -*- C++ -*-
+//
 // $Id$
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "tao/Object_KeyC.h"
+
+#include "Object_KeyC.h"
 #include "tao/Typecode.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "Object_KeyC.i"
-#endif // !defined INLINE
+#endif /* !defined INLINE */
 
-ACE_RCSID(tao, Object_KeyC, "$Id$")
+#if !defined (_TAO_OBJECTKEY_CS_)
+#define _TAO_OBJECTKEY_CS_
 
-const CORBA::Long _oc_TAO__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
 
-  0,
-};
-CORBA::TypeCode _tc_TAO_tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof
-                                            (_oc_TAO__tao_seq_Octet), (char *)
-                                            &_oc_TAO__tao_seq_Octet, 0,
-                                            sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc__tao_seq_Octet = &_tc_TAO_tc_TAO__tao_seq_Octet;
+// *************************************************************
+// TAO::ObjectKey
+// *************************************************************
+
+TAO::ObjectKey::ObjectKey (void)
+{}
+
+TAO::ObjectKey::ObjectKey (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+TAO::ObjectKey::ObjectKey (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
 
-const CORBA::Long _oc_TAO_ObjectKey[] =
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+TAO::ObjectKey::ObjectKey (const ObjectKey &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_ObjectKey[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:TAO/ObjectKey:1.0
-  10, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x7900fdfd),  // name = ObjectKey
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  22,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744b65), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/ObjectKey:1.0
+    10,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744b65), 
+  ACE_NTOHL (0x79000000),  // name = ObjectKey
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
 
-  0,
+    0U,
+
 };
-CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (CORBA::tk_alias, sizeof
-                                       (_oc_TAO_ObjectKey), (char *)
-                                       &_oc_TAO_ObjectKey, 0,
-                                       sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc_TAO_tc_TAO_ObjectKey;
 
+static CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_ObjectKey),
+    (char *) &_oc_TAO_ObjectKey,
+    0,
+    sizeof (TAO::ObjectKey)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectKey,
+    &_tc_TAO_tc_TAO_ObjectKey
+  )
+TAO_NAMESPACE_END
+
+// ****************************************************************
 
 void
-TAO_ObjectKey::encode_sequence_to_string (char * &str,
-                                          const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
+TAO::ObjectKey::encode_sequence_to_string (char * &str,
+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
 {
   // We must allocate a buffer which is (gag) 3 times the length
   // of the sequence, which is the length required in the worst-case
@@ -89,8 +176,8 @@ TAO_ObjectKey::encode_sequence_to_string (char * &str,
 }
 
 void
-TAO_ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                          const char *str)
+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                           const char *str)
 {
   if (str == 0)
     {
@@ -131,3 +218,4 @@ TAO_ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &
 }
 
 // ****************************************************************
+
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index e4d16dffe25..bcc18ebc29b 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -1,17 +1,30 @@
-// -*- c++ -*-
-// $Id$
-//
-// Hand-modified by Chris Cleeland.
+// -*- C++ -*-
 //
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_
+#define _TAO_IDL_ORIG_OBJECT_KEYC_H_
 
-#ifndef TAO_IDL_OBJECT_KEYC_H
-#define TAO_IDL_OBJECT_KEYC_H
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -22,86 +35,202 @@
 
 #include "tao/Sequence.h"
 
-class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
-{
-  // = TITLE
-  //   TAO class used to represent Object Keys
-  //
-  // = DESCRIPTION
-  //   The object is basically a sequence of octets, but we derive
-  //   from it to create a unique type; this is useful for
-  //   overloading.
-  //
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_ObjectKey_var _var_type;
-  #endif /* __GNUC__ */
-
-  TAO_ObjectKey (void);
-  TAO_ObjectKey (CORBA::ULong max);
-  TAO_ObjectKey (CORBA::ULong max,
-                  CORBA::ULong length,
-                  CORBA::Octet *data,
-                  CORBA::Boolean release = 0);
-  TAO_ObjectKey (const TAO_ObjectKey &);
-  TAO_ObjectKey& operator= (const TAO_ObjectKey &);
-
-  static void encode_sequence_to_string (char * &str,
-                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                         const char *str);
-};
-
-class TAO_Export TAO_ObjectKey_var
-{
-public:
-  TAO_ObjectKey_var (void); // default constructor
-  TAO_ObjectKey_var (TAO_ObjectKey *);
-  TAO_ObjectKey_var (const TAO_ObjectKey_var &); // copy constructor
-  ~TAO_ObjectKey_var (void); // destructor
-
-  TAO_ObjectKey_var &operator= (TAO_ObjectKey *);
-  TAO_ObjectKey_var &operator= (const TAO_ObjectKey_var &);
-  TAO_ObjectKey *operator-> (void);
-  const TAO_ObjectKey *operator-> (void) const;
-
-  operator const TAO_ObjectKey &() const;
-  operator TAO_ObjectKey &();
-  operator TAO_ObjectKey &() const;
-  CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const TAO_ObjectKey &in (void) const;
-  TAO_ObjectKey &inout (void);
-  TAO_ObjectKey *&out (void);
-  TAO_ObjectKey *_retn (void);
-  TAO_ObjectKey *ptr (void) const;
-
-private:
-  TAO_ObjectKey *ptr_;
-};
-
-class TAO_Export TAO_ObjectKey_out
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  TAO
 {
-public:
-  TAO_ObjectKey_out (TAO_ObjectKey *&);
-  TAO_ObjectKey_out (TAO_ObjectKey_var &);
-  TAO_ObjectKey_out (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey *);
-  operator TAO_ObjectKey *&();
-  TAO_ObjectKey *&ptr (void);
-  TAO_ObjectKey *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong index);
-
-private:
-  TAO_ObjectKey *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const TAO_ObjectKey_var &);
-};
 
-#if defined (__ACE_INLINE__)
-#include "tao/Object_KeyC.i"
+#if !defined (_TAO_OBJECTKEY_CH_)
+#define _TAO_OBJECTKEY_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ObjectKey;
+  class ObjectKey_var;
+  
+  // *************************************************************
+  // TAO::ObjectKey
+  // *************************************************************
+  
+  class TAO_Export ObjectKey : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ObjectKey (void);
+    ObjectKey (CORBA::ULong max);
+    ObjectKey (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Octet *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ObjectKey (const ObjectKey &);
+    ObjectKey& operator= (const ObjectKey &);
+
+    static void encode_sequence_to_string (char * &str,
+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
+    static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                           const char *str);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_TAO_OBJECTKEY___VAR_CH_)
+#define _TAO_OBJECTKEY___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class TAO::ObjectKey_var
+  // *************************************************************
+  
+  class TAO_Export ObjectKey_var
+  {
+  public:
+    ObjectKey_var (void);
+    ObjectKey_var (ObjectKey *);
+    ObjectKey_var (const ObjectKey_var &);
+    
+    // Fixed-size base types only.
+    ObjectKey_var (const ObjectKey &);
+    
+    ~ObjectKey_var (void);
+    
+    ObjectKey_var &operator= (ObjectKey *);
+    ObjectKey_var &operator= (const ObjectKey_var &);
+    
+    // Fixed-size base types only.
+    ObjectKey_var &operator= (const ObjectKey &);
+    
+    ObjectKey *operator-> (void);
+    const ObjectKey *operator-> (void) const;
+    
+    operator const ObjectKey &() const;
+    operator ObjectKey &();
+    operator ObjectKey &() const;
+    CORBA::Octet & operator[] (CORBA::ULong index);
+    const CORBA::Octet & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
+    const ObjectKey &in (void) const;
+    ObjectKey &inout (void);
+    ObjectKey *&out (void);
+    ObjectKey *_retn (void);
+    ObjectKey *ptr (void) const;
+  
+  private:
+    ObjectKey *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_TAO_OBJECTKEY___OUT_CH_)
+#define _TAO_OBJECTKEY___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export ObjectKey_out
+  {
+  public:
+    ObjectKey_out (ObjectKey *&);
+    ObjectKey_out (ObjectKey_var &);
+    ObjectKey_out (const ObjectKey_out &);
+    ObjectKey_out &operator= (const ObjectKey_out &);
+    ObjectKey_out &operator= (ObjectKey *);
+    operator ObjectKey *&();
+    ObjectKey *&ptr (void);
+    ObjectKey *operator-> (void);
+    CORBA::Octet & operator[] (CORBA::ULong index);
+  
+  private:
+    ObjectKey *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ObjectKey_var &);
+  };
+
+#endif /* end #if !defined */
+  
+}
+TAO_NAMESPACE_CLOSE // module TAO
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_TAO_ObjectKey_H_
+#define _TAO_CDR_OP_TAO_ObjectKey_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const TAO::ObjectKey &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO::ObjectKey &
+  );
+
+#endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+
+#if defined (__ACE_INLINE__)
+#include "Object_KeyC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
-#endif /* TAO_IDL_OBJECT_KEYC_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
index 4f26c346930..bd6b0f0bec0 100644
--- a/TAO/tao/Object_KeyC.i
+++ b/TAO/tao/Object_KeyC.i
@@ -1,92 +1,83 @@
+// -*- C++ -*-
+//
 // $Id$
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class TAO_ObjectKey
-// *************************************************************
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (void)
-{
-}
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{
-}
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max,
-                                CORBA::ULong length,
-                                CORBA::Octet *data,
-                                CORBA::Boolean release)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max, length, data, release)
-{
-}
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (const TAO_ObjectKey &rhs)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (rhs)
-{
-}
 
-ACE_INLINE TAO_ObjectKey&
-TAO_ObjectKey::operator= (const TAO_ObjectKey &rhs)
-{
-  if (this == &rhs)
-    return *this;
+#if !defined (_TAO_OBJECTKEY_CI_)
+#define _TAO_OBJECTKEY_CI_
 
-  TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs);
-  return *this;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
-// Inline operations for class TAO_ObjectKey_var
+// Inline operations for class TAO::ObjectKey_var
 // *************************************************************
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (void) // default constructor
-	: ptr_ (0)
+TAO::ObjectKey_var::ObjectKey_var (void)
+  : ptr_ (0)
 {}
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (TAO_ObjectKey *p)
-	: ptr_ (p)
+TAO::ObjectKey_var::ObjectKey_var (ObjectKey *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (const TAO_ObjectKey_var &p) // copy constructor
+TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, 
-             TAO_ObjectKey(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TAO::ObjectKey (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
+}
+
+// Fixed-size base types only.
+ACE_INLINE
+TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey &p)
+{
+  ACE_NEW (this->ptr_, ::TAO::ObjectKey (p));
 }
 
 ACE_INLINE
-TAO_ObjectKey_var::~TAO_ObjectKey_var (void) // destructor
+TAO::ObjectKey_var::~ObjectKey_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (TAO_ObjectKey *p)
+ACE_INLINE
+TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (ObjectKey *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
+ACE_INLINE
+::TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey_var &p)
 {
   if (this != &p)
     {
@@ -97,12 +88,16 @@ TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
         }
       else
         {
-          TAO_ObjectKey *deep_copy = 
-            new TAO_ObjectKey (*p.ptr_);
+          ObjectKey *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectKey (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              TAO_ObjectKey *tmp = deep_copy;
+              ObjectKey *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -113,136 +108,174 @@ TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
   return *this;
 }
 
-ACE_INLINE const TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void) const
+// Fixed-size types only.
+ACE_INLINE
+::TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey &p)
+{
+  if (this->ptr_ != &p)
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::TAO::ObjectKey (p), *this);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::TAO::ObjectKey *
+TAO::ObjectKey_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator const TAO_ObjectKey &() const // cast
+ACE_INLINE
+TAO::ObjectKey_var::operator const ::TAO::ObjectKey &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() // cast 
+ACE_INLINE
+TAO::ObjectKey_var::operator ::TAO::ObjectKey &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() const// cast 
+ACE_INLINE
+TAO::ObjectKey_var::operator ::TAO::ObjectKey &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_var::operator[] (CORBA::ULong slot)
+ACE_INLINE
+CORBA::Octet &
+TAO::ObjectKey_var::operator[] (CORBA::ULong index)
 {
-  return this->ptr_->operator[] (slot);
+  return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const TAO_ObjectKey &
-TAO_ObjectKey_var::in (void) const
+ACE_INLINE
+const CORBA::Octet &
+TAO::ObjectKey_var::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
+}
+
+ACE_INLINE
+const ::TAO::ObjectKey &
+TAO::ObjectKey_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey &
-TAO_ObjectKey_var::inout (void)
+ACE_INLINE
+::TAO::ObjectKey &
+TAO::ObjectKey_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_var::out (void)
+ACE_INLINE
+::TAO::ObjectKey *&
+TAO::ObjectKey_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::_retn (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_var::_retn (void)
 {
-  TAO_ObjectKey *tmp = this->ptr_;
+  ::TAO::ObjectKey *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::ptr (void) const
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
-// Inline operations for class TAO_ObjectKey_out
+// Inline operations for class TAO::ObjectKey_out
 // *************************************************************
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey *&p)
-	: ptr_ (p)
+TAO::ObjectKey_out::ObjectKey_out (ObjectKey *&p)
+  : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_var &p) // constructor from _var
-	: ptr_ (p.out ())
+TAO::ObjectKey_out::ObjectKey_out (ObjectKey_var &p)
+  : ptr_ (p.out ())
 {
   delete this->ptr_;
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_out &p) // copy constructor
-	: ptr_ (p.ptr_)
+TAO::ObjectKey_out::ObjectKey_out (const ::TAO::ObjectKey_out &p)
+  : ptr_ (ACE_const_cast (ObjectKey_out&, p).ptr_)
 {}
 
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey_out &p)
+ACE_INLINE
+::TAO::ObjectKey_out &
+TAO::ObjectKey_out::operator= (const ::TAO::ObjectKey_out &p)
 {
-  this->ptr_ = p.ptr_;
+  this->ptr_ = ACE_const_cast (ObjectKey_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey *p)
+ACE_INLINE
+::TAO::ObjectKey_out &
+TAO::ObjectKey_out::operator= (ObjectKey *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_out::operator TAO_ObjectKey *&() // cast
+ACE_INLINE
+TAO::ObjectKey_out::operator ::TAO::ObjectKey *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_out::ptr (void) // ptr
+ACE_INLINE
+::TAO::ObjectKey *&
+TAO::ObjectKey_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_out::operator-> (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_out::operator[] (CORBA::ULong slot)
+ACE_INLINE
+CORBA::Octet &
+TAO::ObjectKey_out::operator[] (CORBA::ULong index)
 {
-  return this->ptr_->operator[] (slot);
+  return this->ptr_->operator[] (index);
 }
 
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 1c5708dee1d..3e58a83ec8f 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -8,9 +8,9 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
+//          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
 //          OctetSeq.pidl
@@ -30,6 +30,4 @@ module CORBA
   typedef sequence<octet> OctetSeq;
 };
 
-#pragma prefix ""
-
 #endif  /* TAO_CORBA_OCTET_SEQ_IDL */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 1e4ff14dd8b..08a15a1a13a 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -19,74 +19,108 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "OctetSeqC.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "Any_T.h"
 #include "ORB_Core.h"
 
 #if !defined (_CORBA_OCTETSEQ_CS_)
 #define _CORBA_OCTETSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::OctetSeq
 // *************************************************************
 
-CORBA_OctetSeq::CORBA_OctetSeq (void)
+CORBA::OctetSeq::OctetSeq (void)
 {}
-CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::OctetSeq::OctetSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+CORBA::OctetSeq::OctetSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &seq) // copy ctor
-  :
+
+CORBA::OctetSeq::OctetSeq (const OctetSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
-CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor
+
+CORBA::OctetSeq::~OctetSeq (void) // dtor
 {}
-void CORBA_OctetSeq::_tao_any_destructor (void *x)
+
+void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_OctetSeq *tmp = ACE_static_cast (CORBA_OctetSeq*,x);
+  OctetSeq *tmp = ACE_static_cast (OctetSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f63), ACE_NTOHL (0x74657453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = OctetSeq
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f63), 
+  ACE_NTOHL (0x74657453), 
+  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+    9,
+  ACE_NTOHL (0x4f637465), 
+  ACE_NTOHL (0x74536571), 
+  ACE_NTOHL (0x0),  // name = OctetSeq
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -94,172 +128,167 @@ static const CORBA::Long _oc_CORBA_OctetSeq[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_OctetSeq),
+    (char *) &_oc_CORBA_OctetSeq,
+    0,
+    sizeof (CORBA::OctetSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_OctetSeq,
+    &_tc_TAO_tc_CORBA_OctetSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_OctetSeq &_tao_elem
-  ) // copying
+    const CORBA::OctetSeq &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_OctetSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
+      CORBA::_tc_OctetSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OctetSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
       CORBA::_tc_OctetSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA_OctetSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OctetSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OctetSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA_OctetSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::OctetSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OctetSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA_OctetSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA_OctetSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_OctetSeq, 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_OctetSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA_OctetSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
+        _tao_any,
+        CORBA::OctetSeq::_tao_any_destructor,
+        CORBA::_tc_OctetSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_OctetSeq &_tao_sequence
+    const CORBA::OctetSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_OctetSeq &_tao_sequence
+    CORBA::OctetSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-                          ACE_Message_Block::DONT_DELETE))
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
         TAO_ORB_Core* orb_core = strm.orb_core ();
-
         if (orb_core != 0 &&
-            strm.orb_core ()->resource_factory ()->
-            input_cdr_allocator_type_locked () == 1)
-          {
-            TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-              ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-            oseq->replace (_tao_seq_len, strm.start ());
-            oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-            strm.skip_bytes (_tao_seq_len);
-            return 1;
-          }
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
+
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 1faaeb8ee23..3c228ea2a12 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_OCTETSEQC_H_
-#define _TAO_IDL_CORBA_OCTETSEQC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
+#define _TAO_IDL_ORIG_OCTETSEQC_H_
 
 #include "ace/pre.h"
 #include "corbafwd.h"
@@ -54,150 +57,188 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+
 #if !defined (_CORBA_OCTETSEQ_CH_)
 #define _CORBA_OCTETSEQ_CH_
-
-  class CORBA_OctetSeq;
-  class CORBA_OctetSeq_var;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class OctetSeq;
+  class OctetSeq_var;
   
   // *************************************************************
   // CORBA::OctetSeq
   // *************************************************************
   
-  class TAO_Export CORBA_OctetSeq : public 
+  class TAO_Export OctetSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_Sequence<CORBA::Octet>
+  TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::Octet>
+  TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    CORBA_OctetSeq (void); // default ctor
-    CORBA_OctetSeq (CORBA::ULong max); // uses max size
-    CORBA_OctetSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Octet *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_OctetSeq (const CORBA_OctetSeq &); // copy ctor
-    ~CORBA_OctetSeq (void);
+    OctetSeq (void);
+    OctetSeq (CORBA::ULong max);
+    OctetSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Octet *buffer, 
+        CORBA::Boolean release = 0
+      );
+    OctetSeq (const OctetSeq &);
+    ~OctetSeq (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_OctetSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    typedef OctetSeq_var _var_type;
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    CORBA_OctetSeq (
+    OctetSeq (
         CORBA::ULong length,
         const ACE_Message_Block* mb
       )
       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_OCTETSEQ___VAR_CH_)
 #define _CORBA_OCTETSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::OctetSeq_var
   // *************************************************************
-
-  class TAO_Export CORBA_OctetSeq_var
+  
+  class TAO_Export OctetSeq_var
   {
   public:
-    CORBA_OctetSeq_var (void); // default constructor
-    CORBA_OctetSeq_var (CORBA_OctetSeq *);
-    CORBA_OctetSeq_var (const CORBA_OctetSeq_var &); // copy constructor
-    CORBA_OctetSeq_var (const CORBA_OctetSeq &); // fixed-size base types only
-    ~CORBA_OctetSeq_var (void); // destructor
+    OctetSeq_var (void);
+    OctetSeq_var (OctetSeq *);
+    OctetSeq_var (const OctetSeq_var &);
+    
+    // Fixed-size base types only.
+    OctetSeq_var (const OctetSeq &);
     
-    CORBA_OctetSeq_var &operator= (CORBA_OctetSeq *);
-    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq_var &);
-    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq &); // fixed-size base types only
-    CORBA_OctetSeq *operator-> (void);
-    const CORBA_OctetSeq *operator-> (void) const;
+    ~OctetSeq_var (void);
     
-    operator const CORBA_OctetSeq &() const;
-    operator CORBA_OctetSeq &();
-    operator CORBA_OctetSeq &() const;
+    OctetSeq_var &operator= (OctetSeq *);
+    OctetSeq_var &operator= (const OctetSeq_var &);
     
+    // Fixed-size base types only.
+    OctetSeq_var &operator= (const OctetSeq &);
+    
+    OctetSeq *operator-> (void);
+    const OctetSeq *operator-> (void) const;
+    
+    operator const OctetSeq &() const;
+    operator OctetSeq &();
+    operator OctetSeq &() const;
     CORBA::Octet & operator[] (CORBA::ULong index);
     const CORBA::Octet & operator[] (CORBA::ULong index) const;
     
     // in, inout, out, _retn 
-    const CORBA_OctetSeq &in (void) const;
-    CORBA_OctetSeq &inout (void);
-    CORBA_OctetSeq *&out (void);
-    CORBA_OctetSeq *_retn (void);
-    CORBA_OctetSeq *ptr (void) const;
-
+    const OctetSeq &in (void) const;
+    OctetSeq &inout (void);
+    OctetSeq *&out (void);
+    OctetSeq *_retn (void);
+    OctetSeq *ptr (void) const;
+  
   private:
-    CORBA_OctetSeq *ptr_;
+    OctetSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_OCTETSEQ___OUT_CH_)
 #define _CORBA_OCTETSEQ___OUT_CH_
-
-  class TAO_Export CORBA_OctetSeq_out
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export OctetSeq_out
   {
   public:
-    CORBA_OctetSeq_out (CORBA_OctetSeq *&);
-    CORBA_OctetSeq_out (CORBA_OctetSeq_var &);
-    CORBA_OctetSeq_out (const CORBA_OctetSeq_out &);
-    CORBA_OctetSeq_out &operator= (const CORBA_OctetSeq_out &);
-    CORBA_OctetSeq_out &operator= (CORBA_OctetSeq *);
-    operator CORBA_OctetSeq *&();
-    CORBA_OctetSeq *&ptr (void);
-    CORBA_OctetSeq *operator-> (void);
+    OctetSeq_out (OctetSeq *&);
+    OctetSeq_out (OctetSeq_var &);
+    OctetSeq_out (const OctetSeq_out &);
+    OctetSeq_out &operator= (const OctetSeq_out &);
+    OctetSeq_out &operator= (OctetSeq *);
+    operator OctetSeq *&();
+    OctetSeq *&ptr (void);
+    OctetSeq *operator-> (void);
     CORBA::Octet & operator[] (CORBA::ULong index);
-    
+  
   private:
-    CORBA_OctetSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_OctetSeq_var &);
+    OctetSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const OctetSeq_var &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
-// Proxy Broker Factory function pointer declarations.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_OctetSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_OctetSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OctetSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OctetSeq *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
 #define _TAO_CDR_OP_CORBA_OctetSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_OctetSeq &
+    const CORBA::OctetSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_OctetSeq &
+    CORBA::OctetSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
@@ -213,3 +254,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index 01ffb2d3fba..9fcc77e584e 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -23,52 +23,61 @@
 #if !defined (_CORBA_OCTETSEQ_CI_)
 #define _CORBA_OCTETSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::OctetSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_OctetSeq_var::CORBA_OctetSeq_var (void) // default constructor
+CORBA::OctetSeq_var::OctetSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_OctetSeq_var::CORBA_OctetSeq_var (CORBA_OctetSeq *p)
+CORBA::OctetSeq_var::OctetSeq_var (OctetSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_OctetSeq_var::CORBA_OctetSeq_var (const ::CORBA_OctetSeq_var &p) // copy constructor
+CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_OctetSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::OctetSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
-CORBA_OctetSeq_var::CORBA_OctetSeq_var (const ::CORBA_OctetSeq &p)
+CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p)
 {
-  ACE_NEW (this->ptr_, ::CORBA_OctetSeq (p));
+  ACE_NEW (this->ptr_, ::CORBA::OctetSeq (p));
 }
 
 ACE_INLINE
-CORBA_OctetSeq_var::~CORBA_OctetSeq_var (void) // destructor
+CORBA::OctetSeq_var::~OctetSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_OctetSeq_var &
-CORBA_OctetSeq_var::operator= (CORBA_OctetSeq *p)
+ACE_INLINE
+CORBA::OctetSeq_var &
+CORBA::OctetSeq_var::operator= (OctetSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA_OctetSeq_var &
-CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
+ACE_INLINE
+::CORBA::OctetSeq_var &
+CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
 {
   if (this != &p)
     {
@@ -79,12 +88,16 @@ CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
         }
       else
         {
-          CORBA_OctetSeq *deep_copy =
-            new CORBA_OctetSeq (*p.ptr_);
+          OctetSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              OctetSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA_OctetSeq *tmp = deep_copy;
+              OctetSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -95,108 +108,121 @@ CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::CORBA_OctetSeq_var &
-CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq &p)
+// Fixed-size types only.
+ACE_INLINE
+::CORBA::OctetSeq_var &
+CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_OctetSeq (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::CORBA_OctetSeq *
-CORBA_OctetSeq_var::operator-> (void) const
+ACE_INLINE
+const ::CORBA::OctetSeq *
+CORBA::OctetSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_OctetSeq *
-CORBA_OctetSeq_var::operator-> (void)
+ACE_INLINE
+::CORBA::OctetSeq *
+CORBA::OctetSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_OctetSeq_var::operator const ::CORBA_OctetSeq &() const // cast
+ACE_INLINE
+CORBA::OctetSeq_var::operator const ::CORBA::OctetSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_OctetSeq_var::operator ::CORBA_OctetSeq &() // cast 
+ACE_INLINE
+CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_OctetSeq_var::operator ::CORBA_OctetSeq &() const // cast 
+ACE_INLINE
+CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-CORBA_OctetSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE
+CORBA::Octet &
+CORBA::OctetSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
-CORBA_OctetSeq_var::operator[] (CORBA::ULong index) const
+ACE_INLINE
+const CORBA::Octet &
+CORBA::OctetSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA_OctetSeq &
-CORBA_OctetSeq_var::in (void) const
+ACE_INLINE
+const ::CORBA::OctetSeq &
+CORBA::OctetSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_OctetSeq &
-CORBA_OctetSeq_var::inout (void)
+ACE_INLINE
+::CORBA::OctetSeq &
+CORBA::OctetSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA_OctetSeq *&
-CORBA_OctetSeq_var::out (void)
+ACE_INLINE
+::CORBA::OctetSeq *&
+CORBA::OctetSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_OctetSeq *
-CORBA_OctetSeq_var::_retn (void)
+ACE_INLINE
+::CORBA::OctetSeq *
+CORBA::OctetSeq_var::_retn (void)
 {
-  ::CORBA_OctetSeq *tmp = this->ptr_;
+  ::CORBA::OctetSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA_OctetSeq *
-CORBA_OctetSeq_var::ptr (void) const
+ACE_INLINE
+::CORBA::OctetSeq *
+CORBA::OctetSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
-// Inline operations for class CORBA_OctetSeq_out
+// Inline operations for class CORBA::OctetSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_OctetSeq_out::CORBA_OctetSeq_out (CORBA_OctetSeq *&p)
+CORBA::OctetSeq_out::OctetSeq_out (OctetSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_OctetSeq_out::CORBA_OctetSeq_out (CORBA_OctetSeq_var &p) // constructor from _var
+CORBA::OctetSeq_out::OctetSeq_out (OctetSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -204,62 +230,69 @@ CORBA_OctetSeq_out::CORBA_OctetSeq_out (CORBA_OctetSeq_var &p) // constructor fr
 }
 
 ACE_INLINE
-CORBA_OctetSeq_out::CORBA_OctetSeq_out (const ::CORBA_OctetSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_OctetSeq_out&, p).ptr_)
+CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p)
+  : ptr_ (ACE_const_cast (OctetSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA_OctetSeq_out &
-CORBA_OctetSeq_out::operator= (const ::CORBA_OctetSeq_out &p)
+ACE_INLINE
+::CORBA::OctetSeq_out &
+CORBA::OctetSeq_out::operator= (const ::CORBA::OctetSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_OctetSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (OctetSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA_OctetSeq_out &
-CORBA_OctetSeq_out::operator= (CORBA_OctetSeq *p)
+ACE_INLINE
+::CORBA::OctetSeq_out &
+CORBA::OctetSeq_out::operator= (OctetSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
-CORBA_OctetSeq_out::operator ::CORBA_OctetSeq *&() // cast
+ACE_INLINE
+CORBA::OctetSeq_out::operator ::CORBA::OctetSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_OctetSeq *&
-CORBA_OctetSeq_out::ptr (void) // ptr
+ACE_INLINE
+::CORBA::OctetSeq *&
+CORBA::OctetSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_OctetSeq *
-CORBA_OctetSeq_out::operator-> (void)
+ACE_INLINE
+::CORBA::OctetSeq *
+CORBA::OctetSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-CORBA_OctetSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE
+CORBA::Octet &
+CORBA::OctetSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
 #define _TAO_CDR_OP_CORBA_OctetSeq_I_
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA_OctetSeq &
+    const CORBA::OctetSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
-    CORBA_OctetSeq &
+    CORBA::OctetSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 256fa10946b..1374580b17b 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -17,7 +17,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index 3db501a1b73..84069d295fa 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -15,7 +15,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -58,6 +58,4 @@ module CORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_POLICY_FORWARD_PIDL */
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 2acfd50b377..41e26a19683 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Policy_ForwardC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Policy_ForwardC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,9 +44,12 @@
 #include "Policy_ForwardC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyType[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -52,11 +60,11 @@ static const CORBA::Long _oc_CORBA_PolicyType[] =
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-  11,
+    11,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70650000),  // name = PolicyType
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -70,9 +78,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyType, &_tc_TAO_tc_CORBA_PolicyType)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyType,
+    &_tc_TAO_tc_CORBA_PolicyType
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -87,25 +101,27 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA:
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = tao_CORBA_Policy_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-    
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_Policy_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -113,7 +129,10 @@ void
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -163,59 +182,79 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) cons
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYLIST_CS_)
 #define _CORBA_POLICYLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::PolicyList
 // *************************************************************
 
 CORBA::PolicyList::PolicyList (void)
 {}
-CORBA::PolicyList::PolicyList (CORBA::ULong max) // uses max size
+
+CORBA::PolicyList::PolicyList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::PolicyList::PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA::Policy_ptr *buffer, CORBA::Boolean release)
+
+CORBA::PolicyList::PolicyList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Policy_ptr *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::PolicyList::PolicyList (const PolicyList &seq) // copy ctor
+
+CORBA::PolicyList::PolicyList (const PolicyList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::PolicyList::~PolicyList (void) // dtor
 {}
+
 void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyList *tmp = ACE_static_cast (PolicyList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -226,11 +265,11 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
   ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
-  11,
+    11,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794c69), 
   ACE_NTOHL (0x73740000),  // name = PolicyList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -245,10 +284,10 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
       ACE_NTOHL (0x6c696379), 
       ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-      7,
+            7,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63790000),  // name = Policy
-
+      
     0U,
 
 };
@@ -263,9 +302,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyList, &_tc_TAO_tc_CORBA_PolicyList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyList,
+    &_tc_TAO_tc_CORBA_PolicyList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -279,16 +324,21 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_allocate_buffer (CORBA::ULo
   tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-    
-    if (this->release_)
-      _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old);
-    
-  }
+    {
+      CORBA::ULong *old =
+        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -296,75 +346,96 @@ void
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
+    {
+      return;
+    }
   
+  CORBA::ULong *tmp =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Dtor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
 #define _CORBA_POLICYTYPESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::PolicyTypeSeq
 // *************************************************************
 
 CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) // uses max size
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) // copy ctor
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) // dtor
 {}
+
 void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -375,12 +446,12 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-  14,
+    14,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70655365), 
   ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
@@ -396,11 +467,11 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-      11,
+            11,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63795479), 
       ACE_NTOHL (0x70650000),  // name = PolicyType
-      CORBA::tk_ulong,
+            CORBA::tk_ulong,
 
 
     0U,
@@ -417,9 +488,16 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyTypeSeq, &_tc_TAO_tc_CORBA_PolicyTypeSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyTypeSeq,
+    &_tc_TAO_tc_CORBA_PolicyTypeSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_SetOverrideType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -450,7 +528,7 @@ static const CORBA::Long _oc_CORBA_SetOverrideType[] =
   ACE_NTOHL (0x4f564552), 
   ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
     CORBA::tk_enum,
@@ -462,12 +540,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SetOverrideType,
+    &_tc_TAO_tc_CORBA_SetOverrideType
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -475,16 +556,12 @@ void operator<<= (
     const CORBA::PolicyList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
+      _tao_any,
+      CORBA::PolicyList::_tao_any_destructor,
+      CORBA::_tc_PolicyList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -493,19 +570,12 @@ void operator<<= (
     CORBA::PolicyList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::PolicyList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
+      _tao_any,
+      CORBA::PolicyList::_tao_any_destructor,
+      CORBA::_tc_PolicyList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -514,8 +584,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::PolicyList*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::PolicyList *&,
       _tao_elem
     );
 }
@@ -526,76 +596,17 @@ CORBA::Boolean operator>>= (
     const CORBA::PolicyList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyList
-          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::PolicyList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::PolicyList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::PolicyList,
-            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_PolicyList,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::PolicyList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
+        _tao_any,
+        CORBA::PolicyList::_tao_any_destructor,
+        CORBA::_tc_PolicyList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -603,16 +614,12 @@ void operator<<= (
     const CORBA::PolicyTypeSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyTypeSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
+      _tao_any,
+      CORBA::PolicyTypeSeq::_tao_any_destructor,
+      CORBA::_tc_PolicyTypeSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -621,19 +628,12 @@ void operator<<= (
     CORBA::PolicyTypeSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyTypeSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::PolicyTypeSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
+      _tao_any,
+      CORBA::PolicyTypeSeq::_tao_any_destructor,
+      CORBA::_tc_PolicyTypeSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -642,8 +642,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::PolicyTypeSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::PolicyTypeSeq *&,
       _tao_elem
     );
 }
@@ -654,129 +654,75 @@ CORBA::Boolean operator>>= (
     const CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyTypeSeq
-          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::PolicyTypeSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::PolicyTypeSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::PolicyTypeSeq,
-            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_PolicyTypeSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::PolicyTypeSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
+        _tao_any,
+        CORBA::PolicyTypeSeq::_tao_any_destructor,
+        CORBA::_tc_PolicyTypeSeq,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SetOverrideType _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
+      _tao_any,
       CORBA::_tc_SetOverrideType,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::SetOverrideType &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType 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 ()
+  return
+    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
+        _tao_any,
+        CORBA::_tc_SetOverrideType,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::PolicyList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            tao_CORBA_Policy_marshal (_tao_sequence[i].in (), strm);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -785,40 +731,57 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -827,21 +790,30 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 8964b32dcc9..36da527ab32 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_POLICY_FORWARDC_H_
-#define _TAO_IDL_POLICY_FORWARDC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -56,25 +59,41 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
   
-  class Policy;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
   
+  class Policy;
+
 #if !defined (_CORBA_POLICY___PTR_CH_)
 #define _CORBA_POLICY___PTR_CH_
   
   typedef Policy *Policy_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___VAR_CH_)
 #define _CORBA_POLICY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Policy_var : public TAO_Base_var
   {
   public:
@@ -114,13 +133,14 @@ TAO_NAMESPACE  CORBA
     Policy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Policy_out
   {
   public:
@@ -137,21 +157,21 @@ TAO_NAMESPACE  CORBA
   private:
     Policy_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
@@ -192,55 +212,61 @@ TAO_NAMESPACE  CORBA
       );
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyList;
   class PolicyList_var;
   
   // *************************************************************
-  // PolicyList
+  // CORBA::PolicyList
   // *************************************************************
   
   class TAO_Export PolicyList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<Policy,Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyList (void); // default ctor
-    PolicyList (CORBA::ULong max); // uses max size
+    PolicyList (void);
+    PolicyList (CORBA::ULong max);
     PolicyList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         Policy_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyList (const PolicyList &); // copy ctor
+    PolicyList (const PolicyList &);
     ~PolicyList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYLIST___VAR_CH_)
 #define _CORBA_POLICYLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::PolicyList_var
   // *************************************************************
@@ -261,7 +287,9 @@ TAO_NAMESPACE  CORBA
     operator const PolicyList &() const;
     operator PolicyList &();
     operator PolicyList &() const;
-    operator PolicyList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator PolicyList *&();
     
     TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
     
@@ -275,14 +303,15 @@ TAO_NAMESPACE  CORBA
   private:
     PolicyList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYLIST___OUT_CH_)
 #define _CORBA_POLICYLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyList_out
   {
   public:
@@ -301,23 +330,26 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const PolicyList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
   
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
+  class TAO_Export _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
@@ -354,55 +386,61 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyTypeSeq;
   class PolicyTypeSeq_var;
   
   // *************************************************************
-  // PolicyTypeSeq
+  // CORBA::PolicyTypeSeq
   // *************************************************************
   
   class TAO_Export PolicyTypeSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyTypeSeq (void); // default ctor
-    PolicyTypeSeq (CORBA::ULong max); // uses max size
+    PolicyTypeSeq (void);
+    PolicyTypeSeq (CORBA::ULong max);
     PolicyTypeSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::ULong *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyTypeSeq (const PolicyTypeSeq &); // copy ctor
+    PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyTypeSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_)
 #define _CORBA_POLICYTYPESEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::PolicyTypeSeq_var
   // *************************************************************
@@ -413,21 +451,24 @@ TAO_NAMESPACE  CORBA
     PolicyTypeSeq_var (void);
     PolicyTypeSeq_var (PolicyTypeSeq *);
     PolicyTypeSeq_var (const PolicyTypeSeq_var &);
+    
     // Fixed-size base types only.
     PolicyTypeSeq_var (const PolicyTypeSeq &);
+    
     ~PolicyTypeSeq_var (void);
     
     PolicyTypeSeq_var &operator= (PolicyTypeSeq *);
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &);
+    
     // Fixed-size base types only.
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq &);
+    
     PolicyTypeSeq *operator-> (void);
     const PolicyTypeSeq *operator-> (void) const;
     
     operator const PolicyTypeSeq &() const;
     operator PolicyTypeSeq &();
     operator PolicyTypeSeq &() const;
-    
     PolicyType & operator[] (CORBA::ULong index);
     const PolicyType & operator[] (CORBA::ULong index) const;
     
@@ -441,14 +482,15 @@ TAO_NAMESPACE  CORBA
   private:
     PolicyTypeSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_)
 #define _CORBA_POLICYTYPESEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyTypeSeq_out
   {
   public:
@@ -467,12 +509,17 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const PolicyTypeSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
@@ -480,60 +527,106 @@ TAO_NAMESPACE  CORBA
   };
   
   typedef SetOverrideType &SetOverrideType_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
+
 // External declarations for undefined interface
+
 // CORBA::Policy
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_duplicate (
     CORBA::Policy_ptr
   );
+
 TAO_Export
 void
 tao_CORBA_Policy_release (
     CORBA::Policy_ptr
   );
+
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_nil (
     void
   );
+
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_Export
 CORBA::Object *
 tao_CORBA_Policy_upcast (
     void *
   );
 
-// Any operators for interface CORBA::Policy
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr);
+TAO_Export
+CORBA::Boolean
+tao_CORBA_Policy_marshal (
+    CORBA::Policy_ptr,
+    TAO_OutputCDR &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_H_
 #define _TAO_CDR_OP_CORBA_PolicyList_H_
 
@@ -548,6 +641,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
 #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
@@ -563,11 +658,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); // 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Policy_ForwardC.i"
@@ -583,3 +686,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i
index 2f7c341fe78..6da5cf38028 100644
--- a/TAO/tao/Policy_ForwardC.i
+++ b/TAO/tao/Policy_ForwardC.i
@@ -20,12 +20,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_
 
-ACE_INLINE CORBA::Policy **
+ACE_INLINE
+CORBA::Policy **
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::Policy **buf = 0;
@@ -40,11 +44,15 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong n
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -60,64 +68,83 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Se
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Policy* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Policy* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(
+    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-    CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Policy **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
+      CORBA::Policy ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      tao_CORBA_Policy_release (tmp[i]);
-      tmp[i] = tao_CORBA_Policy_nil ();
+      CORBA::Policy **tmp =
+        ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_Policy_release (tmp[i]);
+          tmp[i] = tao_CORBA_Policy_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Policy **tmp1 = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-  CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Policy **tmp1 =
+    ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+  
+  CORBA::Policy ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -127,70 +154,78 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Un
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::Policy ** const tmp = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
+  CORBA::Policy ** const tmp =
+    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::Policy* *
+ACE_INLINE
+CORBA::Policy* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Policy **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::Policy**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::Policy**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Policy* *
+ACE_INLINE
+const CORBA::Policy* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYLIST_CI_)
 #define _CORBA_POLICYLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyList_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (void) // default constructor
+CORBA::PolicyList_var::PolicyList_var (void)
   : ptr_ (0)
 {}
 
@@ -200,21 +235,26 @@ CORBA::PolicyList_var::PolicyList_var (PolicyList *p)
 {}
 
 ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p) // copy constructor
+CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::PolicyList_var::~PolicyList_var (void) // destructor
+CORBA::PolicyList_var::~PolicyList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyList_var &
+ACE_INLINE
+CORBA::PolicyList_var &
 CORBA::PolicyList_var::operator= (PolicyList *p)
 {
   delete this->ptr_;
@@ -222,7 +262,8 @@ CORBA::PolicyList_var::operator= (PolicyList *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyList_var &
+ACE_INLINE
+::CORBA::PolicyList_var &
 CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
 {
   if (this != &p)
@@ -234,8 +275,12 @@ CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
         }
       else
         {
-          PolicyList *deep_copy =
-            new PolicyList (*p.ptr_);
+          PolicyList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -250,63 +295,68 @@ CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::PolicyList *
+ACE_INLINE
+const ::CORBA::PolicyList *
 CORBA::PolicyList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator const ::CORBA::PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA::PolicyList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::PolicyList &
+ACE_INLINE
+const ::CORBA::PolicyList &
 CORBA::PolicyList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList &
+ACE_INLINE
+::CORBA::PolicyList &
 CORBA::PolicyList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::PolicyList *&
+ACE_INLINE
+::CORBA::PolicyList *&
 CORBA::PolicyList_var::out (void)
 {
   delete this->ptr_;
@@ -314,7 +364,8 @@ CORBA::PolicyList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_var::_retn (void)
 {
   ::CORBA::PolicyList *tmp = this->ptr_;
@@ -322,12 +373,16 @@ CORBA::PolicyList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyList_out
 // *************************************************************
@@ -340,7 +395,7 @@ CORBA::PolicyList_out::PolicyList_out (PolicyList *&p)
 }
 
 ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p) // constructor from _var
+CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -348,237 +403,280 @@ CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p) // constructor from _v
 }
 
 ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p) // copy constructor
+CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p)
   : ptr_ (ACE_const_cast (PolicyList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::PolicyList_out &
+ACE_INLINE
+::CORBA::PolicyList_out &
 CORBA::PolicyList_out::operator= (const ::CORBA::PolicyList_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyList_out &
+ACE_INLINE
+::CORBA::PolicyList_out &
 CORBA::PolicyList_out::operator= (PolicyList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_out::operator ::CORBA::PolicyList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *&
+ACE_INLINE
+::CORBA::PolicyList *&
 CORBA::PolicyList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA::PolicyList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_
 
-// = Static operations.
-ACE_INLINE CORBA::ULong *
+ACE_INLINE
+CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   CORBA::ULong *retval = 0;
   ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
   return retval;
 }
 
-ACE_INLINE void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
-// Free the sequence.
+ACE_INLINE
+void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Default constructor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
-// Copy constructor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
+    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::ULong *tmp1 = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::ULong *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_);
+      CORBA::ULong * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ULong *tmp =
+            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::ULong *tmp1 =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  CORBA::ULong * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE CORBA::ULong &
+ACE_INLINE
+CORBA::ULong &
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
+  CORBA::ULong* tmp =
+    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::ULong &
+ACE_INLINE
+const CORBA::ULong &
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
+  CORBA::ULong * const tmp =
+    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE CORBA::ULong *
+ACE_INLINE
+CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::ULong *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::ULong *
+ACE_INLINE
+const CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-CORBA::ULong *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
-  }
+    {
+      CORBA::ULong *tmp =
+        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYTYPESEQ_CI_)
 #define _CORBA_POLICYTYPESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyTypeSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void) // default constructor
+CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -588,15 +686,19 @@ CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (PolicyTypeSeq *p)
 {}
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p) // copy constructor
+CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p)
 {
@@ -604,12 +706,13 @@ CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p)
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void) // destructor
+CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyTypeSeq_var &
+ACE_INLINE
+CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p)
 {
   delete this->ptr_;
@@ -617,7 +720,8 @@ CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_var &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
 {
   if (this != &p)
@@ -629,8 +733,12 @@ CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
         }
       else
         {
-          PolicyTypeSeq *deep_copy =
-            new PolicyTypeSeq (*p.ptr_);
+          PolicyTypeSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyTypeSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -645,74 +753,82 @@ CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::CORBA::PolicyTypeSeq_var &
+// Fixed-size types only.
+ACE_INLINE
+::CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+const ::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyType &
+ACE_INLINE
+CORBA::PolicyType &
 CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::PolicyType &
+ACE_INLINE
+const CORBA::PolicyType &
 CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::PolicyTypeSeq &
+ACE_INLINE
+const ::CORBA::PolicyTypeSeq &
 CORBA::PolicyTypeSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq &
+ACE_INLINE
+::CORBA::PolicyTypeSeq &
 CORBA::PolicyTypeSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::PolicyTypeSeq *&
+ACE_INLINE
+::CORBA::PolicyTypeSeq *&
 CORBA::PolicyTypeSeq_var::out (void)
 {
   delete this->ptr_;
@@ -720,7 +836,8 @@ CORBA::PolicyTypeSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::_retn (void)
 {
   ::CORBA::PolicyTypeSeq *tmp = this->ptr_;
@@ -728,12 +845,16 @@ CORBA::PolicyTypeSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyTypeSeq_out
 // *************************************************************
@@ -746,7 +867,7 @@ CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq *&p)
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p) // constructor from _var
+CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -754,51 +875,58 @@ CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p) // constructo
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p) // copy constructor
+CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p)
   : ptr_ (ACE_const_cast (PolicyTypeSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_out &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_out &
 CORBA::PolicyTypeSeq_out::operator= (const ::CORBA::PolicyTypeSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyTypeSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_out &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_out &
 CORBA::PolicyTypeSeq_out::operator= (PolicyTypeSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *&
+ACE_INLINE
+::CORBA::PolicyTypeSeq *&
 CORBA::PolicyTypeSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyType &
+ACE_INLINE
+CORBA::PolicyType &
 CORBA::PolicyTypeSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::Policy_ptr
@@ -809,6 +937,8 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::Policy_ptr &
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_I_
 #define _TAO_CDR_OP_CORBA_PolicyList_I_
@@ -817,6 +947,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::PolicyList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::PolicyList &
@@ -824,6 +955,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
 #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
@@ -832,6 +965,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::PolicyTypeSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::PolicyTypeSeq &
@@ -839,13 +973,18 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
index cf90aebe81c..c5fc4162c13 100644
--- a/TAO/tao/Pollable.pidl
+++ b/TAO/tao/Pollable.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *     -o orig -Gp -Gd -Ge 1
  *     -Wb,export_macro=TAO_Export
  *     -Wb,export_include="tao/corbafwd.h"
  *     -Wb,pre_include="ace/pre.h"
@@ -64,6 +64,4 @@ module CORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* TAO_POLLABLE_PIDL */
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index c289b24a51d..e581fd4db71 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "PollableC.h"
 
 #if (TAO_HAS_AMI_POLLER == 1)
@@ -33,6 +37,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -41,6 +47,9 @@
 #include "PollableC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::Pollable::_tao_class_id = 0;
 
 CORBA::Pollable_ptr
@@ -86,13 +95,23 @@ tao_CORBA_Pollable_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Pollable_marshal (
+    CORBA::Pollable_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::Pollable_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::Pollable_var::Pollable_var (void) // default constructor
+CORBA::Pollable_var::Pollable_var (void)
   : ptr_ (Pollable::_nil ())
 {}
 
@@ -102,12 +121,12 @@ CORBA::Pollable_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p) // copy constructor
+CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p)
   : TAO_Base_var (),
     ptr_ (Pollable::_duplicate (p.ptr ()))
 {}
 
-CORBA::Pollable_var::~Pollable_var (void) // destructor
+CORBA::Pollable_var::~Pollable_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -136,7 +155,7 @@ CORBA::Pollable_var::operator const ::CORBA::Pollable_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast
+CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -211,10 +230,11 @@ CORBA::Pollable_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::Pollable_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::Pollable_out::Pollable_out (Pollable_ptr &p)
@@ -223,14 +243,14 @@ CORBA::Pollable_out::Pollable_out (Pollable_ptr &p)
   this->ptr_ = ::CORBA::Pollable::_nil ();
 }
 
-CORBA::Pollable_out::Pollable_out (Pollable_var &p) // constructor from _var
+CORBA::Pollable_out::Pollable_out (Pollable_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::Pollable::_nil ();
 }
 
-CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p) // copy constructor
+CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p)
   : ptr_ (ACE_const_cast (Pollable_out &, p).ptr_)
 {}
 
@@ -261,7 +281,7 @@ CORBA::Pollable_out::operator ::CORBA::Pollable_ptr &() // cast
 }
 
 ::CORBA::Pollable_ptr &
-CORBA::Pollable_out::ptr (void) // ptr
+CORBA::Pollable_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -272,9 +292,8 @@ CORBA::Pollable_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::Pollable::Pollable (void)
 {}
@@ -282,7 +301,8 @@ CORBA::Pollable::Pollable (void)
 CORBA::Pollable::~Pollable (void)
 {}
 
-CORBA::Pollable_ptr CORBA::Pollable::_narrow (
+CORBA::Pollable_ptr
+CORBA::Pollable::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -290,50 +310,68 @@ CORBA::Pollable_ptr CORBA::Pollable::_narrow (
   return Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Pollable_ptr
+CORBA::Pollable_ptr 
 CORBA::Pollable::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Pollable::_nil ();
+    {
+      return Pollable::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Pollable_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Pollable::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Pollable::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::Pollable_ptr
 CORBA::Pollable::_duplicate (Pollable_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::Pollable::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, Pollable)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Pollable)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -342,6 +380,9 @@ const char* CORBA::Pollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Pollable:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::DIIPollable::_tao_class_id = 0;
 
 CORBA::DIIPollable_ptr
@@ -387,13 +428,23 @@ tao_CORBA_DIIPollable_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_DIIPollable_marshal (
+    CORBA::DIIPollable_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::DIIPollable_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::DIIPollable_var::DIIPollable_var (void) // default constructor
+CORBA::DIIPollable_var::DIIPollable_var (void)
   : ptr_ (DIIPollable::_nil ())
 {}
 
@@ -403,12 +454,12 @@ CORBA::DIIPollable_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p) // copy constructor
+CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p)
   : TAO_Base_var (),
     ptr_ (DIIPollable::_duplicate (p.ptr ()))
 {}
 
-CORBA::DIIPollable_var::~DIIPollable_var (void) // destructor
+CORBA::DIIPollable_var::~DIIPollable_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -437,7 +488,7 @@ CORBA::DIIPollable_var::operator const ::CORBA::DIIPollable_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast
+CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -512,10 +563,11 @@ CORBA::DIIPollable_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::DIIPollable_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p)
@@ -524,14 +576,14 @@ CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p)
   this->ptr_ = ::CORBA::DIIPollable::_nil ();
 }
 
-CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p) // constructor from _var
+CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::DIIPollable::_nil ();
 }
 
-CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p) // copy constructor
+CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p)
   : ptr_ (ACE_const_cast (DIIPollable_out &, p).ptr_)
 {}
 
@@ -562,7 +614,7 @@ CORBA::DIIPollable_out::operator ::CORBA::DIIPollable_ptr &() // cast
 }
 
 ::CORBA::DIIPollable_ptr &
-CORBA::DIIPollable_out::ptr (void) // ptr
+CORBA::DIIPollable_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -573,9 +625,8 @@ CORBA::DIIPollable_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::DIIPollable::DIIPollable (void)
 {}
@@ -583,7 +634,8 @@ CORBA::DIIPollable::DIIPollable (void)
 CORBA::DIIPollable::~DIIPollable (void)
 {}
 
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
+CORBA::DIIPollable_ptr
+CORBA::DIIPollable::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -591,62 +643,82 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
   return DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::DIIPollable_ptr
+CORBA::DIIPollable_ptr 
 CORBA::DIIPollable::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DIIPollable::_nil ();
+    {
+      return DIIPollable::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DIIPollable_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DIIPollable::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DIIPollable::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::DIIPollable_ptr
 CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::DIIPollable::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Pollable_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Pollable_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -655,6 +727,9 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DIIPollable:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::PollableSet::_tao_class_id = 0;
 
 CORBA::PollableSet_ptr
@@ -700,13 +775,23 @@ tao_CORBA_PollableSet_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_PollableSet_marshal (
+    CORBA::PollableSet_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::PollableSet_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::PollableSet_var::PollableSet_var (void) // default constructor
+CORBA::PollableSet_var::PollableSet_var (void)
   : ptr_ (PollableSet::_nil ())
 {}
 
@@ -716,12 +801,12 @@ CORBA::PollableSet_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p) // copy constructor
+CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p)
   : TAO_Base_var (),
     ptr_ (PollableSet::_duplicate (p.ptr ()))
 {}
 
-CORBA::PollableSet_var::~PollableSet_var (void) // destructor
+CORBA::PollableSet_var::~PollableSet_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -750,7 +835,7 @@ CORBA::PollableSet_var::operator const ::CORBA::PollableSet_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast
+CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -825,10 +910,11 @@ CORBA::PollableSet_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::PollableSet_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p)
@@ -837,14 +923,14 @@ CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p)
   this->ptr_ = ::CORBA::PollableSet::_nil ();
 }
 
-CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p) // constructor from _var
+CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::PollableSet::_nil ();
 }
 
-CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p) // copy constructor
+CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p)
   : ptr_ (ACE_const_cast (PollableSet_out &, p).ptr_)
 {}
 
@@ -875,7 +961,7 @@ CORBA::PollableSet_out::operator ::CORBA::PollableSet_ptr &() // cast
 }
 
 ::CORBA::PollableSet_ptr &
-CORBA::PollableSet_out::ptr (void) // ptr
+CORBA::PollableSet_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -886,9 +972,8 @@ CORBA::PollableSet_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::PollableSet::PollableSet (void)
 {}
@@ -896,7 +981,8 @@ CORBA::PollableSet::PollableSet (void)
 CORBA::PollableSet::~PollableSet (void)
 {}
 
-CORBA::PollableSet_ptr CORBA::PollableSet::_narrow (
+CORBA::PollableSet_ptr
+CORBA::PollableSet::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -904,50 +990,68 @@ CORBA::PollableSet_ptr CORBA::PollableSet::_narrow (
   return PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::PollableSet_ptr
+CORBA::PollableSet_ptr 
 CORBA::PollableSet::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PollableSet::_nil ();
+    {
+      return PollableSet::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PollableSet_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PollableSet::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PollableSet::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::PollableSet_ptr
 CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::PollableSet::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, PollableSet)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, PollableSet)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -956,7 +1060,9 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PollableSet:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
   : CORBA_UserException (
         "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
@@ -965,12 +1071,10 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
 {
 }
 
-// Copy constructor.
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -979,7 +1083,6 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla
 {
 }
 
-// Assignment operator.
 CORBA::PollableSet::NoPossiblePollable&
 CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
 {
@@ -988,11 +1091,11 @@ CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::N
 }
 
 CORBA::PollableSet::NoPossiblePollable *
-CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc)
+CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoPossiblePollable *, exc);
+      return ACE_dynamic_cast (NoPossiblePollable *, _tao_excp);
     }
   else
     {
@@ -1013,13 +1116,13 @@ CORBA::PollableSet::NoPossiblePollable::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::PollableSet::NoPossiblePollable (*this),
+      ::CORBA::PollableSet::NoPossiblePollable (*this),
       0
     );
   return result;
 }
 
-void CORBA::PollableSet::NoPossiblePollable::_raise ()
+void CORBA::PollableSet::NoPossiblePollable::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1040,7 +1143,11 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
   : CORBA_UserException (
         "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
@@ -1049,12 +1156,10 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::PollableSet::UnknownPollable::~UnknownPollable (void)
 {
 }
 
-// Copy constructor.
 CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -1063,7 +1168,6 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet
 {
 }
 
-// Assignment operator.
 CORBA::PollableSet::UnknownPollable&
 CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
 {
@@ -1072,11 +1176,11 @@ CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::Unkn
 }
 
 CORBA::PollableSet::UnknownPollable *
-CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc)
+CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (UnknownPollable *, exc);
+      return ACE_dynamic_cast (UnknownPollable *, _tao_excp);
     }
   else
     {
@@ -1097,13 +1201,13 @@ CORBA::PollableSet::UnknownPollable::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::PollableSet::UnknownPollable (*this),
+      ::CORBA::PollableSet::UnknownPollable (*this),
       0
     );
   return result;
 }
 
-void CORBA::PollableSet::UnknownPollable::_raise ()
+void CORBA::PollableSet::UnknownPollable::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1124,25 +1228,7 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* TAO_HAS_AMI_POLLER == 1 */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 5752e5ace91..e82096e2673 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_POLLABLEC_H_
 #define _TAO_IDL_ORIG_POLLABLEC_H_
 
@@ -26,6 +29,7 @@
 #include "tao/corbafwd.h"
 
 #if (TAO_HAS_AMI_POLLER == 1)
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -57,21 +61,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
-  class PollableSet;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class PollableSet;
+
 #if !defined (_CORBA_POLLABLESET___PTR_CH_)
 #define _CORBA_POLLABLESET___PTR_CH_
   
   typedef PollableSet *PollableSet_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PollableSet_var : public TAO_Base_var
   {
   public:
@@ -111,13 +124,14 @@ TAO_NAMESPACE  CORBA
     PollableSet_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___OUT_CH_)
 #define _CORBA_POLLABLESET___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PollableSet_out
   {
   public:
@@ -134,23 +148,26 @@ TAO_NAMESPACE  CORBA
   private:
     PollableSet_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLLABLE___PTR_CH_)
 #define _CORBA_POLLABLE___PTR_CH_
   
   class Pollable;
   typedef Pollable *Pollable_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLE___VAR_CH_)
 #define _CORBA_POLLABLE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Pollable_var : public TAO_Base_var
   {
   public:
@@ -190,13 +207,14 @@ TAO_NAMESPACE  CORBA
     Pollable_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLE___OUT_CH_)
 #define _CORBA_POLLABLE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Pollable_out
   {
   public:
@@ -213,23 +231,21 @@ TAO_NAMESPACE  CORBA
   private:
     Pollable_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLLABLE_CH_)
 #define _CORBA_POLLABLE_CH_
   
   class TAO_Export Pollable
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Pollable_ptr _ptr_type;
     typedef Pollable_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -250,6 +266,11 @@ TAO_NAMESPACE  CORBA
         return (Pollable_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_ready (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -258,44 +279,52 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::PollableSet_ptr create_pollable_set (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Pollable (void);
-    
     virtual ~Pollable (void);
-  
+    
   private:
     Pollable (const Pollable &);
     void operator= (const Pollable &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_DIIPOLLABLE___PTR_CH_)
 #define _CORBA_DIIPOLLABLE___PTR_CH_
   
   class DIIPollable;
   typedef DIIPollable *DIIPollable_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DIIPOLLABLE___VAR_CH_)
 #define _CORBA_DIIPOLLABLE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export DIIPollable_var : public TAO_Base_var
   {
   public:
@@ -335,13 +364,14 @@ TAO_NAMESPACE  CORBA
     DIIPollable_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DIIPOLLABLE___OUT_CH_)
 #define _CORBA_DIIPOLLABLE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export DIIPollable_out
   {
   public:
@@ -358,11 +388,12 @@ TAO_NAMESPACE  CORBA
   private:
     DIIPollable_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_DIIPOLLABLE_CH_)
 #define _CORBA_DIIPOLLABLE_CH_
   
@@ -370,11 +401,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Pollable
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DIIPollable_ptr _ptr_type;
     typedef DIIPollable_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -395,36 +423,44 @@ TAO_NAMESPACE  CORBA
         return (DIIPollable_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DIIPollable (void);
-    
     virtual ~DIIPollable (void);
-  
+    
   private:
     DIIPollable (const DIIPollable &);
     void operator= (const DIIPollable &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLLABLESET___PTR_CH_)
 #define _CORBA_POLLABLESET___PTR_CH_
   
   class PollableSet;
   typedef PollableSet *PollableSet_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PollableSet_var : public TAO_Base_var
   {
   public:
@@ -464,13 +500,14 @@ TAO_NAMESPACE  CORBA
     PollableSet_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___OUT_CH_)
 #define _CORBA_POLLABLESET___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PollableSet_out
   {
   public:
@@ -487,23 +524,21 @@ TAO_NAMESPACE  CORBA
   private:
     PollableSet_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
   
   class TAO_Export PollableSet
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PollableSet_ptr _ptr_type;
     typedef PollableSet_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -525,6 +560,10 @@ TAO_NAMESPACE  CORBA
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
     
@@ -537,7 +576,7 @@ TAO_NAMESPACE  CORBA
       ~NoPossiblePollable (void);
 
       NoPossiblePollable &operator= (const NoPossiblePollable &);
-
+      
       static NoPossiblePollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -555,13 +594,15 @@ TAO_NAMESPACE  CORBA
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
     
@@ -574,7 +615,7 @@ TAO_NAMESPACE  CORBA
       ~UnknownPollable (void);
 
       UnknownPollable &operator= (const UnknownPollable &);
-
+      
       static UnknownPollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -592,20 +633,25 @@ TAO_NAMESPACE  CORBA
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::DIIPollable_ptr create_dii_pollable (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_pollable (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -614,6 +660,9 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Pollable_ptr poll (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -623,6 +672,9 @@ TAO_NAMESPACE  CORBA
         , CORBA::PollableSet::NoPossiblePollable
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -632,41 +684,57 @@ TAO_NAMESPACE  CORBA
         , CORBA::PollableSet::UnknownPollable
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort number_left (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PollableSet (void);
-    
     virtual ~PollableSet (void);
+    
+    friend class _TAO_PollableSet_Remote_Proxy_Impl;
+    friend class _TAO_PollableSet_ThruPOA_Proxy_Impl;
+    friend class _TAO_PollableSet_Direct_Proxy_Impl;
   
   private:
     PollableSet (const PollableSet &);
     void operator= (const PollableSet &);
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PollableC.i"
@@ -684,3 +752,4 @@ TAO_NAMESPACE_CLOSE // module CORBA
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 6fb811d052f..437f3407c58 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -20,31 +20,48 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_POLLABLE___CI_)
 #define _CORBA_POLLABLE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Pollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_DIIPOLLABLE___CI_)
 #define _CORBA_DIIPOLLABLE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::DIIPollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception CORBA::PollableSet::NoPossiblePollable
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA::PollableSet::UnknownPollable
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_POLLABLESET___CI_)
 #define _CORBA_POLLABLESET___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::PollableSet::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 7a7b1cdb605..2db0543b4c8 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -22,7 +22,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Gv
+ *     -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 62a2213a918..dce736579ef 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableInterceptorC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "PortableInterceptorC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,6 +44,9 @@
 #include "PortableInterceptorC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::Interceptor::_tao_class_id = 0;
 
 PortableInterceptor::Interceptor_ptr
@@ -84,13 +92,23 @@ tao_PortableInterceptor_Interceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_Interceptor_marshal (
+    PortableInterceptor::Interceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::Interceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::Interceptor_var::Interceptor_var (void) // default constructor
+PortableInterceptor::Interceptor_var::Interceptor_var (void)
   : ptr_ (Interceptor::_nil ())
 {}
 
@@ -100,12 +118,12 @@ PortableInterceptor::Interceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) // copy constructor
+PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p)
   : TAO_Base_var (),
     ptr_ (Interceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::Interceptor_var::~Interceptor_var (void) // destructor
+PortableInterceptor::Interceptor_var::~Interceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -134,7 +152,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -209,10 +227,11 @@ PortableInterceptor::Interceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::Interceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
@@ -221,14 +240,14 @@ PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
   this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
 }
 
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p) // constructor from _var
+PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
 }
 
-PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p) // copy constructor
+PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p)
   : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_)
 {}
 
@@ -259,7 +278,7 @@ PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Intercepto
 }
 
 ::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_out::ptr (void) // ptr
+PortableInterceptor::Interceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -270,9 +289,8 @@ PortableInterceptor::Interceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::Interceptor::Interceptor (void)
 {}
@@ -280,7 +298,15 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
+void 
+PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Interceptor *tmp = ACE_static_cast (Interceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -288,73 +314,133 @@ PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
   return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_ptr 
 PortableInterceptor::Interceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Interceptor::_nil ();
+    {
+      return Interceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Interceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Interceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Interceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::Interceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/Interceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/Interceptor:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
+    12,
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f7200),  // name = Interceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Interceptor),
+    (char *) &_oc_PortableInterceptor_Interceptor,
+    0,
+    sizeof (PortableInterceptor::Interceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Interceptor,
+    &_tc_TAO_tc_PortableInterceptor_Interceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
   : CORBA_UserException (
-        "IDL:PortableInterceptor/ForwardRequest:1.0",
+        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -365,7 +451,6 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
   this->permanent = _tao_excp.permanent;
 }
 
-// Assignment operator.
 PortableInterceptor::ForwardRequest&
 PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
 {
@@ -382,11 +467,11 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p
 }
 
 PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ForwardRequest *, exc);
+      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
     }
   else
     {
@@ -407,13 +492,13 @@ PortableInterceptor::ForwardRequest::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ForwardRequest (*this),
+      ::PortableInterceptor::ForwardRequest (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ForwardRequest::_raise ()
+void PortableInterceptor::ForwardRequest::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -427,7 +512,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -440,16 +525,20 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableInterceptor::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward,
     CORBA::Boolean _tao_permanent
-  )
-  : CORBA_UserException (
-        "IDL:PortableInterceptor/ForwardRequest:1.0",
+  )  : CORBA_UserException (
+        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
 {
@@ -457,51 +546,46 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
   this->permanent = _tao_permanent;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
+{
+  return ::PortableInterceptor::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
-  15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
+    15,
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
-  8,
-  ACE_NTOHL (0x666f7277),
+    8,
+  ACE_NTOHL (0x666f7277), 
   ACE_NTOHL (0x61726400),  // name = forward
-  CORBA::tk_objref,
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63740000),  // name = Object
-
-  10,
-  ACE_NTOHL (0x7065726d),
-  ACE_NTOHL (0x616e656e),
+      10,
+  ACE_NTOHL (0x7065726d), 
+  ACE_NTOHL (0x616e656e), 
   ACE_NTOHL (0x74000000),  // name = permanent
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
 };
 
@@ -515,35 +599,37 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableInterceptor_ForwardRequest)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ForwardRequest,
+    &_tc_TAO_tc_PortableInterceptor_ForwardRequest
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
-{
-  return ::PortableInterceptor::_tc_ForwardRequest;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
-  ACE_NTOHL (0x7475733a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
-  12,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
+    12,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -557,50 +643,35 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ReplyStatus, &_tc_TAO_tc_PortableInterceptor_ReplyStatus)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ReplyStatus,
+    &_tc_TAO_tc_PortableInterceptor_ReplyStatus
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SUCCESSFUL, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYSTEM_EXCEPTION, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, USER_EXCEPTION, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, LOCATION_FORWARD, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, LOCATION_FORWARD_PERMANENT, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, TRANSPORT_RETRY, 5)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x536c6f74),
-  ACE_NTOHL (0x49643a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
-  7,
-  ACE_NTOHL (0x536c6f74),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
+    7,
+  ACE_NTOHL (0x536c6f74), 
   ACE_NTOHL (0x49640000),  // name = SlotId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -614,24 +685,28 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SlotId, &_tc_TAO_tc_PortableInterceptor_SlotId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SlotId,
+    &_tc_TAO_tc_PortableInterceptor_SlotId
+  )
 TAO_NAMESPACE_END
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
   : CORBA_UserException (
-        "IDL:PortableInterceptor/InvalidSlot:1.0",
+        "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
         "InvalidSlot"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::InvalidSlot::~InvalidSlot (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -640,7 +715,6 @@ PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::Inva
 {
 }
 
-// Assignment operator.
 PortableInterceptor::InvalidSlot&
 PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
 {
@@ -655,11 +729,11 @@ void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_poin
 }
 
 PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc)
+PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/InvalidSlot:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidSlot *, exc);
+      return ACE_dynamic_cast (InvalidSlot *, _tao_excp);
     }
   else
     {
@@ -680,13 +754,13 @@ PortableInterceptor::InvalidSlot::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::InvalidSlot (*this),
+      ::PortableInterceptor::InvalidSlot (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::InvalidSlot::_raise ()
+void PortableInterceptor::InvalidSlot::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -700,7 +774,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -713,30 +787,41 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
+{
+  return ::PortableInterceptor::_tc_InvalidSlot;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
-  ACE_NTOHL (0x6c6f743a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
-  12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
     CORBA::tk_except,
@@ -748,15 +833,15 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_InvalidSlot, &_tc_TAO_tc_PortableInterceptor_InvalidSlot)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InvalidSlot,
+    &_tc_TAO_tc_PortableInterceptor_InvalidSlot
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
-{
-  return ::PortableInterceptor::_tc_InvalidSlot;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int PortableInterceptor::Current::_tao_class_id = 0;
 
@@ -803,13 +888,23 @@ tao_PortableInterceptor_Current_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_Current_marshal (
+    PortableInterceptor::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::Current_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::Current_var::Current_var (void) // default constructor
+PortableInterceptor::Current_var::Current_var (void)
   : ptr_ (Current::_nil ())
 {}
 
@@ -819,12 +914,12 @@ PortableInterceptor::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p) // copy constructor
+PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p)
   : TAO_Base_var (),
     ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::Current_var::~Current_var (void) // destructor
+PortableInterceptor::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -853,7 +948,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -928,10 +1023,11 @@ PortableInterceptor::Current_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::Current_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::Current_out::Current_out (Current_ptr &p)
@@ -940,14 +1036,14 @@ PortableInterceptor::Current_out::Current_out (Current_ptr &p)
   this->ptr_ = ::PortableInterceptor::Current::_nil ();
 }
 
-PortableInterceptor::Current_out::Current_out (Current_var &p) // constructor from _var
+PortableInterceptor::Current_out::Current_out (Current_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::Current::_nil ();
 }
 
-PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p) // copy constructor
+PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p)
   : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
@@ -978,7 +1074,7 @@ PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &(
 }
 
 ::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_out::ptr (void) // ptr
+PortableInterceptor::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -989,9 +1085,8 @@ PortableInterceptor::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::Current::Current (void)
 {}
@@ -999,7 +1094,15 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
+void 
+PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::Current_ptr
+PortableInterceptor::Current::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1007,70 +1110,133 @@ PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Current_ptr
+PortableInterceptor::Current_ptr 
 PortableInterceptor::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Current::_nil ();
+    {
+      return Current::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Current_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Current::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::Current_ptr
 PortableInterceptor::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::Current::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/Current:1.0";
+  return "IDL:omg.org/PortableInterceptor/Current:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Current),
+    (char *) &_oc_PortableInterceptor_Current,
+    0,
+    sizeof (PortableInterceptor::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_PortableInterceptor_Current
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::RequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::RequestInfo_ptr
@@ -1116,13 +1282,23 @@ tao_PortableInterceptor_RequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_RequestInfo_marshal (
+    PortableInterceptor::RequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::RequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::RequestInfo_var::RequestInfo_var (void) // default constructor
+PortableInterceptor::RequestInfo_var::RequestInfo_var (void)
   : ptr_ (RequestInfo::_nil ())
 {}
 
@@ -1132,12 +1308,12 @@ PortableInterceptor::RequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p) // copy constructor
+PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (RequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::RequestInfo_var::~RequestInfo_var (void) // destructor
+PortableInterceptor::RequestInfo_var::~RequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1166,7 +1342,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1241,10 +1417,11 @@ PortableInterceptor::RequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::RequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
@@ -1253,14 +1430,14 @@ PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
 }
 
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p) // constructor from _var
+PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
 }
 
-PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p) // copy constructor
+PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p)
   : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_)
 {}
 
@@ -1291,7 +1468,7 @@ PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInf
 }
 
 ::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_out::ptr (void) // ptr
+PortableInterceptor::RequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1302,9 +1479,8 @@ PortableInterceptor::RequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::RequestInfo::RequestInfo (void)
 {}
@@ -1312,7 +1488,15 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
+void 
+PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestInfo *tmp = ACE_static_cast (RequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1320,58 +1504,121 @@ PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
   return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_ptr 
 PortableInterceptor::RequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return RequestInfo::_nil ();
+    {
+      return RequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           RequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &RequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &RequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/RequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
+    12,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x6e666f00),  // name = RequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_RequestInfo),
+    (char *) &_oc_PortableInterceptor_RequestInfo,
+    0,
+    sizeof (PortableInterceptor::RequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_RequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -1417,13 +1664,23 @@ tao_PortableInterceptor_ClientRequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ClientRequestInfo_marshal (
+    PortableInterceptor::ClientRequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) // default constructor
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void)
   : ptr_ (ClientRequestInfo::_nil ())
 {}
 
@@ -1433,12 +1690,12 @@ PortableInterceptor::ClientRequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p) // copy constructor
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ClientRequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void) // destructor
+PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1467,7 +1724,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1542,10 +1799,11 @@ PortableInterceptor::ClientRequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p)
@@ -1554,14 +1812,14 @@ PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequest
   this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p) // constructor from _var
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p) // copy constructor
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p)
   : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_)
 {}
 
@@ -1592,7 +1850,7 @@ PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::Clie
 }
 
 ::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_out::ptr (void) // ptr
+PortableInterceptor::ClientRequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1603,9 +1861,8 @@ PortableInterceptor::ClientRequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 {}
@@ -1613,7 +1870,15 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow (
+void 
+PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientRequestInfo *tmp = ACE_static_cast (ClientRequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1621,70 +1886,139 @@ PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInf
   return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_ptr 
 PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientRequestInfo::_nil ();
+    {
+      return ClientRequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ClientRequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ClientRequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ClientRequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::RequestInfo_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::RequestInfo_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ClientRequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInfo),
+    (char *) &_oc_PortableInterceptor_ClientRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ClientRequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -1730,13 +2064,23 @@ tao_PortableInterceptor_ServerRequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ServerRequestInfo_marshal (
+    PortableInterceptor::ServerRequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) // default constructor
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void)
   : ptr_ (ServerRequestInfo::_nil ())
 {}
 
@@ -1746,12 +2090,12 @@ PortableInterceptor::ServerRequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p) // copy constructor
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ServerRequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void) // destructor
+PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1780,7 +2124,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1855,10 +2199,11 @@ PortableInterceptor::ServerRequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p)
@@ -1867,14 +2212,14 @@ PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequest
   this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p) // constructor from _var
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p) // copy constructor
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p)
   : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_)
 {}
 
@@ -1905,7 +2250,7 @@ PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::Serv
 }
 
 ::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_out::ptr (void) // ptr
+PortableInterceptor::ServerRequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1916,9 +2261,8 @@ PortableInterceptor::ServerRequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 {}
@@ -1926,7 +2270,15 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow (
+void 
+PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1934,70 +2286,139 @@ PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInf
   return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_ptr 
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerRequestInfo::_nil ();
+    {
+      return ServerRequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerRequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerRequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerRequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::RequestInfo_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::RequestInfo_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ServerRequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInfo),
+    (char *) &_oc_PortableInterceptor_ServerRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerRequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -2043,13 +2464,23 @@ tao_PortableInterceptor_ClientRequestInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ClientRequestInterceptor_marshal (
+    PortableInterceptor::ClientRequestInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) // default constructor
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void)
   : ptr_ (ClientRequestInterceptor::_nil ())
 {}
 
@@ -2059,12 +2490,12 @@ PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) // copy constructor
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void) // destructor
+PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2093,7 +2524,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2168,10 +2599,11 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p)
@@ -2180,14 +2612,14 @@ PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out
   this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p) // constructor from _var
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p) // copy constructor
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
   : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_)
 {}
 
@@ -2218,7 +2650,7 @@ PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableIntercepto
 }
 
 ::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_out::ptr (void) // ptr
+PortableInterceptor::ClientRequestInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2229,9 +2661,8 @@ PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 {}
@@ -2239,7 +2670,15 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow (
+void 
+PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2247,70 +2686,143 @@ PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientReq
   return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_ptr 
 PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientRequestInterceptor::_nil ();
+    {
+      return ClientRequestInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ClientRequestInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ClientRequestInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ClientRequestInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ClientRequestInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ClientRequestInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -2356,13 +2868,23 @@ tao_PortableInterceptor_ServerRequestInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ServerRequestInterceptor_marshal (
+    PortableInterceptor::ServerRequestInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) // default constructor
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void)
   : ptr_ (ServerRequestInterceptor::_nil ())
 {}
 
@@ -2372,12 +2894,12 @@ PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) // copy constructor
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void) // destructor
+PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2406,7 +2928,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2481,10 +3003,11 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p)
@@ -2493,14 +3016,14 @@ PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out
   this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p) // constructor from _var
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p) // copy constructor
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
   : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_)
 {}
 
@@ -2531,7 +3054,7 @@ PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableIntercepto
 }
 
 ::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_out::ptr (void) // ptr
+PortableInterceptor::ServerRequestInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2542,9 +3065,8 @@ PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 {}
@@ -2552,7 +3074,15 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow (
+void 
+PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerRequestInterceptor *tmp = ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2560,70 +3090,143 @@ PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerReq
   return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_ptr 
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerRequestInterceptor::_nil ();
+    {
+      return ServerRequestInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerRequestInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerRequestInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerRequestInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ServerRequestInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerRequestInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::IORInfo::_tao_class_id = 0;
 
 PortableInterceptor::IORInfo_ptr
@@ -2669,13 +3272,23 @@ tao_PortableInterceptor_IORInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_IORInfo_marshal (
+    PortableInterceptor::IORInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::IORInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::IORInfo_var::IORInfo_var (void) // default constructor
+PortableInterceptor::IORInfo_var::IORInfo_var (void)
   : ptr_ (IORInfo::_nil ())
 {}
 
@@ -2685,12 +3298,12 @@ PortableInterceptor::IORInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p) // copy constructor
+PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p)
   : TAO_Base_var (),
     ptr_ (IORInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::IORInfo_var::~IORInfo_var (void) // destructor
+PortableInterceptor::IORInfo_var::~IORInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2719,7 +3332,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2794,10 +3407,11 @@ PortableInterceptor::IORInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::IORInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
@@ -2806,14 +3420,14 @@ PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
 }
 
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p) // constructor from _var
+PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
 }
 
-PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p) // copy constructor
+PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p)
   : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_)
 {}
 
@@ -2844,7 +3458,7 @@ PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &(
 }
 
 ::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_out::ptr (void) // ptr
+PortableInterceptor::IORInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2855,9 +3469,8 @@ PortableInterceptor::IORInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::IORInfo::IORInfo (void)
 {}
@@ -2865,7 +3478,15 @@ PortableInterceptor::IORInfo::IORInfo (void)
 PortableInterceptor::IORInfo::~IORInfo (void)
 {}
 
-PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
+void 
+PortableInterceptor::IORInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORInfo *tmp = ACE_static_cast (IORInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2873,58 +3494,119 @@ PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
   return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_ptr 
 PortableInterceptor::IORInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IORInfo::_nil ();
+    {
+      return IORInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IORInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IORInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IORInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/IORInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_IORInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInfo:1.0
+    8,
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e666f00),  // name = IORInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_IORInfo),
+    (char *) &_oc_PortableInterceptor_IORInfo,
+    0,
+    sizeof (PortableInterceptor::IORInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORInfo,
+    &_tc_TAO_tc_PortableInterceptor_IORInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::IORInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::IORInterceptor_ptr
@@ -2970,13 +3652,23 @@ tao_PortableInterceptor_IORInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_IORInterceptor_marshal (
+    PortableInterceptor::IORInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::IORInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) // default constructor
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void)
   : ptr_ (IORInterceptor::_nil ())
 {}
 
@@ -2986,12 +3678,12 @@ PortableInterceptor::IORInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p) // copy constructor
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (IORInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void) // destructor
+PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3020,7 +3712,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3095,10 +3787,11 @@ PortableInterceptor::IORInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::IORInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p)
@@ -3107,14 +3800,14 @@ PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr
   this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
 }
 
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p) // constructor from _var
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
 }
 
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p) // copy constructor
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p)
   : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_)
 {}
 
@@ -3145,7 +3838,7 @@ PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInte
 }
 
 ::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_out::ptr (void) // ptr
+PortableInterceptor::IORInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3156,9 +3849,8 @@ PortableInterceptor::IORInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
 {}
@@ -3166,7 +3858,15 @@ PortableInterceptor::IORInterceptor::IORInterceptor (void)
 PortableInterceptor::IORInterceptor::~IORInterceptor (void)
 {}
 
-PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow (
+void 
+PortableInterceptor::IORInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORInterceptor *tmp = ACE_static_cast (IORInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3174,70 +3874,137 @@ PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_na
   return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_ptr 
 PortableInterceptor::IORInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IORInterceptor::_nil ();
+    {
+      return IORInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IORInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IORInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IORInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/IORInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_IORInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x6f723a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInterceptor:1.0
+    15,
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x6f720000),  // name = IORInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_IORInterceptor),
+    (char *) &_oc_PortableInterceptor_IORInterceptor,
+    0,
+    sizeof (PortableInterceptor::IORInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_IORInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::PolicyFactory::_tao_class_id = 0;
 
 PortableInterceptor::PolicyFactory_ptr
@@ -3283,13 +4050,23 @@ tao_PortableInterceptor_PolicyFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_PolicyFactory_marshal (
+    PortableInterceptor::PolicyFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::PolicyFactory_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) // default constructor
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void)
   : ptr_ (PolicyFactory::_nil ())
 {}
 
@@ -3299,12 +4076,12 @@ PortableInterceptor::PolicyFactory_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p) // copy constructor
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p)
   : TAO_Base_var (),
     ptr_ (PolicyFactory::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void) // destructor
+PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3333,7 +4110,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3408,10 +4185,11 @@ PortableInterceptor::PolicyFactory_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::PolicyFactory_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
@@ -3420,14 +4198,14 @@ PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
   this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
 }
 
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p) // constructor from _var
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
 }
 
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p) // copy constructor
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p)
   : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_)
 {}
 
@@ -3458,7 +4236,7 @@ PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFa
 }
 
 ::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_out::ptr (void) // ptr
+PortableInterceptor::PolicyFactory_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3469,9 +4247,8 @@ PortableInterceptor::PolicyFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
 {}
@@ -3479,7 +4256,15 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow (
+void 
+PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PolicyFactory *tmp = ACE_static_cast (PolicyFactory *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3487,68 +4272,123 @@ PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narr
   return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_ptr 
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PolicyFactory::_nil ();
+    {
+      return PolicyFactory::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PolicyFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PolicyFactory::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PolicyFactory::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-::CORBA::Policy_ptr
-PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
 void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/PolicyFactory:1.0";
+  return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
+    14,
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x79000000),  // name = PolicyFactory
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_PolicyFactory),
+    (char *) &_oc_PortableInterceptor_PolicyFactory,
+    0,
+    sizeof (PortableInterceptor::PolicyFactory)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyFactory,
+    &_tc_TAO_tc_PortableInterceptor_PolicyFactory
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ORBInitInfo::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitInfo_ptr
@@ -3594,13 +4434,23 @@ tao_PortableInterceptor_ORBInitInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ORBInitInfo_marshal (
+    PortableInterceptor::ORBInitInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ORBInitInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) // default constructor
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void)
   : ptr_ (ORBInitInfo::_nil ())
 {}
 
@@ -3610,12 +4460,12 @@ PortableInterceptor::ORBInitInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p) // copy constructor
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ORBInitInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void) // destructor
+PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3644,7 +4494,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3719,10 +4569,11 @@ PortableInterceptor::ORBInitInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ORBInitInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
@@ -3731,14 +4582,14 @@ PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p) // constructor from _var
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p) // copy constructor
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p)
   : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_)
 {}
 
@@ -3769,7 +4620,7 @@ PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInf
 }
 
 ::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_out::ptr (void) // ptr
+PortableInterceptor::ORBInitInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3780,9 +4631,8 @@ PortableInterceptor::ORBInitInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
@@ -3790,7 +4640,15 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
+void 
+PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitInfo *tmp = ACE_static_cast (ORBInitInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3798,73 +4656,132 @@ PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
   return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_ptr 
 PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ORBInitInfo::_nil ();
+    {
+      return ORBInitInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ORBInitInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ORBInitInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ORBInitInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ORBInitInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  57,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::ObjectId)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
   : CORBA_UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -3874,7 +4791,6 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::Portable
   this->name = CORBA::string_dup (_tao_excp.name.in ());
 }
 
-// Assignment operator.
 PortableInterceptor::ORBInitInfo::DuplicateName&
 PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
 {
@@ -3883,12 +4799,18 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte
   return *this;
 }
 
+void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  DuplicateName *tmp = ACE_static_cast (DuplicateName*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (DuplicateName *, exc);
+      return ACE_dynamic_cast (DuplicateName *, _tao_excp);
     }
   else
     {
@@ -3909,13 +4831,13 @@ PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ORBInitInfo::DuplicateName (*this),
+      ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ORBInitInfo::DuplicateName::_raise ()
+void PortableInterceptor::ORBInitInfo::DuplicateName::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3936,32 +4858,89 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
     const char * _tao_name
-  )
-  : CORBA_UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+  )  : CORBA_UserException (
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
 {
   this->name = CORBA::string_dup (_tao_name);
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  62,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
+    14,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x65000000),  // name = DuplicateName
+  1, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::DuplicateName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
   : CORBA_UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
         "InvalidName"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -3970,7 +4949,6 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte
 {
 }
 
-// Assignment operator.
 PortableInterceptor::ORBInitInfo::InvalidName&
 PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
 {
@@ -3978,12 +4956,18 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc
   return *this;
 }
 
+void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidName *tmp = ACE_static_cast (InvalidName*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidName *, exc);
+      return ACE_dynamic_cast (InvalidName *, _tao_excp);
     }
   else
     {
@@ -4004,13 +4988,13 @@ PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ORBInitInfo::InvalidName (*this),
+      ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ORBInitInfo::InvalidName::_raise ()
+void PortableInterceptor::ORBInitInfo::InvalidName::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -4031,6 +5015,97 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  60,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x616d6500),  // name = InvalidName
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::InvalidName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
+    12,
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBInitInfo,
+    &_tc_TAO_tc_PortableInterceptor_ORBInitInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ORBInitializer::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitializer_ptr
@@ -4076,13 +5151,23 @@ tao_PortableInterceptor_ORBInitializer_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ORBInitializer_marshal (
+    PortableInterceptor::ORBInitializer_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ORBInitializer_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) // default constructor
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void)
   : ptr_ (ORBInitializer::_nil ())
 {}
 
@@ -4092,12 +5177,12 @@ PortableInterceptor::ORBInitializer_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p) // copy constructor
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p)
   : TAO_Base_var (),
     ptr_ (ORBInitializer::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void) // destructor
+PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4126,7 +5211,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4201,10 +5286,11 @@ PortableInterceptor::ORBInitializer_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ORBInitializer_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p)
@@ -4213,14 +5299,14 @@ PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr
   this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
 }
 
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p) // constructor from _var
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
 }
 
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p) // copy constructor
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p)
   : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_)
 {}
 
@@ -4251,7 +5337,7 @@ PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInit
 }
 
 ::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_out::ptr (void) // ptr
+PortableInterceptor::ORBInitializer_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4262,9 +5348,8 @@ PortableInterceptor::ORBInitializer_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
 {}
@@ -4272,7 +5357,15 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow (
+void 
+PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitializer *tmp = ACE_static_cast (ORBInitializer *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4280,318 +5373,1075 @@ PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_na
   return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_ptr 
 PortableInterceptor::ORBInitializer::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ORBInitializer::_nil ();
+    {
+      return ORBInitializer::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ORBInitializer_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ORBInitializer::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ORBInitializer::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_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 *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_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 *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ORBInitializer:1.0";
+  return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
+    15,
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65720000),  // name = ORBInitializer
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitializer),
+    (char *) &_oc_PortableInterceptor_ORBInitializer,
+    0,
+    sizeof (PortableInterceptor::ORBInitializer)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBInitializer,
+    &_tc_TAO_tc_PortableInterceptor_ORBInitializer
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Interceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::Interceptor_ptr _tao_objptr =
+    PortableInterceptor::Interceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Interceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::Interceptor>::insert (
+      _tao_any,
+      PortableInterceptor::Interceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_Interceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::Interceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::Interceptor>::extract (
+        _tao_any,
+        PortableInterceptor::Interceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_Interceptor,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::Interceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor, PortableInterceptor::Interceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::ForwardRequest &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ForwardRequest::_tao_any_destructor,
       PortableInterceptor::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ForwardRequest *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert (
+      _tao_any,
+      PortableInterceptor::ForwardRequest::_tao_any_destructor,
       PortableInterceptor::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableInterceptor::ForwardRequest::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ForwardRequest *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::ForwardRequest*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::ForwardRequest *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::ForwardRequest *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::extract (
+        _tao_any,
+        PortableInterceptor::ForwardRequest::_tao_any_destructor,
+        PortableInterceptor::_tc_ForwardRequest,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableInterceptor::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ForwardRequest *tmp;
-      ACE_NEW_RETURN (tmp, PortableInterceptor::ForwardRequest, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:PortableInterceptor/ForwardRequest:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableInterceptor::_tc_ForwardRequest,
-            1,
-            tmp,
-            PortableInterceptor::ForwardRequest::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const PortableInterceptor::InvalidSlot &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert_copy (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
       PortableInterceptor::_tc_InvalidSlot,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::InvalidSlot *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
       PortableInterceptor::_tc_InvalidSlot,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::InvalidSlot *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::InvalidSlot*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::InvalidSlot *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableInterceptor::InvalidSlot *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::extract (
+        _tao_any,
+        PortableInterceptor::InvalidSlot::_tao_any_destructor,
+        PortableInterceptor::_tc_InvalidSlot,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableInterceptor::InvalidSlot *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::InvalidSlot *tmp;
-      ACE_NEW_RETURN (tmp, PortableInterceptor::InvalidSlot, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:PortableInterceptor/InvalidSlot:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableInterceptor::_tc_InvalidSlot,
-            1,
-            tmp,
-            PortableInterceptor::InvalidSlot::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr _tao_elem
+  )
+{
+  PortableInterceptor::Current_ptr _tao_objptr =
+    PortableInterceptor::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::Current>::insert (
+      _tao_any,
+      PortableInterceptor::Current::_tao_any_destructor,
+      PortableInterceptor::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::Current>::extract (
+        _tao_any,
+        PortableInterceptor::Current::_tao_any_destructor,
+        PortableInterceptor::_tc_Current,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>
+  template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::Current, PortableInterceptor::Current_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::RequestInfo_ptr _tao_objptr =
+    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::RequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_RequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::RequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_RequestInfo,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::RequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo, PortableInterceptor::RequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::RequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ClientRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ClientRequestInfo,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo, PortableInterceptor::ClientRequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ServerRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ServerRequestInfo,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo, PortableInterceptor::ServerRequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ClientRequestInterceptor_ptr _tao_objptr =
+    PortableInterceptor::ClientRequestInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_ClientRequestInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_ClientRequestInterceptor,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor, PortableInterceptor::ClientRequestInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr =
+    PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_ServerRequestInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_ServerRequestInterceptor,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor, PortableInterceptor::ServerRequestInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::IORInfo_ptr _tao_objptr =
+    PortableInterceptor::IORInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::IORInfo>::insert (
+      _tao_any,
+      PortableInterceptor::IORInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_IORInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::IORInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::IORInfo>::extract (
+        _tao_any,
+        PortableInterceptor::IORInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_IORInfo,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::IORInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo, PortableInterceptor::IORInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::IORInterceptor_ptr _tao_objptr =
+    PortableInterceptor::IORInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::IORInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_IORInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::IORInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::IORInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_IORInterceptor,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor, PortableInterceptor::IORInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr _tao_elem
+  )
+{
+  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
+    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
+      _tao_any,
+      PortableInterceptor::PolicyFactory::_tao_any_destructor,
+      PortableInterceptor::_tc_PolicyFactory,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
+        _tao_any,
+        PortableInterceptor::PolicyFactory::_tao_any_destructor,
+        PortableInterceptor::_tc_PolicyFactory,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>
+  template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory, PortableInterceptor::PolicyFactory_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
+    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitInfo,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo, PortableInterceptor::ORBInitInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
+    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitializer::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitializer,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitializer::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitializer,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
+  template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 8cf394494c0..72c3a9f1b36 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
@@ -60,42 +63,50 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableInterceptor
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_
-
+  
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Interceptor_var : public TAO_Base_var
   {
   public:
     Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {}
+    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
     Interceptor_var (const Interceptor_var &); // copy constructor
     ~Interceptor_var (void); // destructor
-
+    
     Interceptor_var &operator= (Interceptor_ptr);
     Interceptor_var &operator= (const Interceptor_var &);
     Interceptor_ptr operator-> (void) const;
-
+    
     operator const Interceptor_ptr &() const;
     operator Interceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Interceptor_ptr in (void) const;
     Interceptor_ptr &inout (void);
     Interceptor_ptr &out (void);
     Interceptor_ptr _retn (void);
     Interceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Interceptor_ptr tao_duplicate (Interceptor_ptr);
@@ -106,7 +117,7 @@ TAO_NAMESPACE  PortableInterceptor
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Interceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -114,13 +125,14 @@ TAO_NAMESPACE  PortableInterceptor
     Interceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Interceptor_out
   {
   public:
@@ -133,98 +145,111 @@ TAO_NAMESPACE  PortableInterceptor
     operator Interceptor_ptr &();
     Interceptor_ptr &ptr (void);
     Interceptor_ptr operator-> (void);
-
+  
   private:
     Interceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-
+  
   class TAO_Export Interceptor
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Interceptor_ptr _ptr_type;
     typedef Interceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-
+    
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _nil (void)
       {
         return (Interceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * name (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Interceptor (void);
-
     virtual ~Interceptor (void);
-
+    
   private:
     Interceptor (const Interceptor &);
     void operator= (const Interceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Interceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-
+  
   class TAO_Export ForwardRequest : public CORBA::UserException
   {
   public:
+    
     CORBA::Object_var forward;
     CORBA::Boolean permanent;
-
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -236,61 +261,108 @@ TAO_NAMESPACE  PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-        ForwardRequest (
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
+    ForwardRequest (
         const CORBA::Object_ptr  _tao_forward,
         CORBA::Boolean _tao_permanent
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SUCCESSFUL;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYSTEM_EXCEPTION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short USER_EXCEPTION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD_PERMANENT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPORT_RETRY;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SUCCESSFUL = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYSTEM_EXCEPTION = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short USER_EXCEPTION = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short LOCATION_FORWARD = 3;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short LOCATION_FORWARD_PERMANENT = 4;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short TRANSPORT_RETRY = 5;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short UNKNOWN = 6;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-
+  
   class TAO_Export InvalidSlot : public CORBA::UserException
   {
   public:
-
+    
     InvalidSlot (void);
     InvalidSlot (const InvalidSlot &);
     ~InvalidSlot (void);
 
     InvalidSlot &operator= (const InvalidSlot &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static InvalidSlot *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -302,55 +374,63 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
+    Current_var (Current_ptr p) : ptr_ (p) {} 
     Current_var (const Current_var &); // copy constructor
     ~Current_var (void); // destructor
-
+    
     Current_var &operator= (Current_ptr);
     Current_var &operator= (const Current_var &);
     Current_ptr operator-> (void) const;
-
+    
     operator const Current_ptr &() const;
     operator Current_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Current_ptr in (void) const;
     Current_ptr &inout (void);
     Current_ptr &out (void);
     Current_ptr _retn (void);
     Current_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
@@ -361,7 +441,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -369,13 +449,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     Current_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Current_out
   {
   public:
@@ -388,47 +469,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-
+  
   private:
     Current_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,7 +521,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data
@@ -447,58 +534,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Current (void);
-
     virtual ~Current (void);
-
+    
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_
-
+  
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export RequestInfo_var : public TAO_Base_var
   {
   public:
     RequestInfo_var (void); // default constructor
-    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {}
+    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
     RequestInfo_var (const RequestInfo_var &); // copy constructor
     ~RequestInfo_var (void); // destructor
-
+    
     RequestInfo_var &operator= (RequestInfo_ptr);
     RequestInfo_var &operator= (const RequestInfo_var &);
     RequestInfo_ptr operator-> (void) const;
-
+    
     operator const RequestInfo_ptr &() const;
     operator RequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestInfo_ptr in (void) const;
     RequestInfo_ptr &inout (void);
     RequestInfo_ptr &out (void);
     RequestInfo_ptr _retn (void);
     RequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestInfo_ptr tao_duplicate (RequestInfo_ptr);
@@ -509,7 +607,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -517,13 +615,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     RequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export RequestInfo_out
   {
   public:
@@ -536,137 +635,160 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator RequestInfo_ptr &();
     RequestInfo_ptr &ptr (void);
     RequestInfo_ptr operator-> (void);
-
+  
   private:
     RequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-
+  
   class TAO_Export RequestInfo
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-
+    
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _nil (void)
       {
         return (RequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong request_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * operation (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ParameterList * arguments (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ExceptionList * exceptions (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ContextList * contexts (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::RequestContext * operation_context (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * result (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean response_expected (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-#if TAO_HAS_CORBA_MESSAGING == 1
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual Messaging::SyncScope sync_scope (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::ReplyStatus reply_status (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr forward_reference (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -675,7 +797,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::ServiceContext * get_request_service_context (
         IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -683,7 +808,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::ServiceContext * get_reply_service_context (
         IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -691,58 +819,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestInfo (void);
-
     virtual ~RequestInfo (void);
-
+    
   private:
     RequestInfo (const RequestInfo &);
     void operator= (const RequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ClientRequestInfo_var : public TAO_Base_var
   {
   public:
     ClientRequestInfo_var (void); // default constructor
-    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {}
+    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
     ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
     ~ClientRequestInfo_var (void); // destructor
-
+    
     ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
     ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
     ClientRequestInfo_ptr operator-> (void) const;
-
+    
     operator const ClientRequestInfo_ptr &() const;
     operator ClientRequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ClientRequestInfo_ptr in (void) const;
     ClientRequestInfo_ptr &inout (void);
     ClientRequestInfo_ptr &out (void);
     ClientRequestInfo_ptr _retn (void);
     ClientRequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr);
@@ -753,7 +892,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ClientRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -761,13 +900,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ClientRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ClientRequestInfo_out
   {
   public:
@@ -780,87 +920,100 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInfo_ptr &();
     ClientRequestInfo_ptr &ptr (void);
     ClientRequestInfo_ptr operator-> (void);
-
+  
   private:
     ClientRequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-
+  
   class TAO_Export ClientRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-
+    
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _nil (void)
       {
         return (ClientRequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr target (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr effective_target (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedProfile * effective_profile (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * received_exception (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * received_exception_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedComponent * get_effective_component (
         IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -868,7 +1021,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -876,7 +1032,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_request_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -884,7 +1043,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
@@ -893,58 +1055,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ClientRequestInfo (void);
-
     virtual ~ClientRequestInfo (void);
-
+    
   private:
     ClientRequestInfo (const ClientRequestInfo &);
     void operator= (const ClientRequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ServerRequestInfo_var : public TAO_Base_var
   {
   public:
     ServerRequestInfo_var (void); // default constructor
-    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {}
+    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
     ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
     ~ServerRequestInfo_var (void); // destructor
-
+    
     ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
     ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
     ServerRequestInfo_ptr operator-> (void) const;
-
+    
     operator const ServerRequestInfo_ptr &() const;
     operator ServerRequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerRequestInfo_ptr in (void) const;
     ServerRequestInfo_ptr &inout (void);
     ServerRequestInfo_ptr &out (void);
     ServerRequestInfo_ptr _retn (void);
     ServerRequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr);
@@ -955,7 +1128,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -963,13 +1136,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ServerRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ServerRequestInfo_out
   {
   public:
@@ -982,103 +1156,120 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInfo_ptr &();
     ServerRequestInfo_ptr &ptr (void);
     ServerRequestInfo_ptr operator-> (void);
-
+  
   private:
     ServerRequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-
+  
   class TAO_Export ServerRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerRequestInfo_ptr _ptr_type;
     typedef ServerRequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-
+    
     static ServerRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _nil (void)
       {
         return (ServerRequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * sending_exception (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * server_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * orb_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * object_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * adapter_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * target_most_derived_interface (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1086,7 +1277,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data
@@ -1096,7 +1290,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1104,7 +1301,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
@@ -1113,58 +1313,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServerRequestInfo (void);
-
     virtual ~ServerRequestInfo (void);
-
+    
   private:
     ServerRequestInfo (const ServerRequestInfo &);
     void operator= (const ServerRequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_
-
+  
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ClientRequestInterceptor_var (void); // default constructor
-    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {}
+    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
     ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
     ~ClientRequestInterceptor_var (void); // destructor
-
+    
     ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
     ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
     ClientRequestInterceptor_ptr operator-> (void) const;
-
+    
     operator const ClientRequestInterceptor_ptr &() const;
     operator ClientRequestInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ClientRequestInterceptor_ptr in (void) const;
     ClientRequestInterceptor_ptr &inout (void);
     ClientRequestInterceptor_ptr &out (void);
     ClientRequestInterceptor_ptr _retn (void);
     ClientRequestInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr);
@@ -1175,7 +1386,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ClientRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1183,13 +1394,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ClientRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ClientRequestInterceptor_out
   {
   public:
@@ -1202,47 +1414,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInterceptor_ptr &();
     ClientRequestInterceptor_ptr &ptr (void);
     ClientRequestInterceptor_ptr operator-> (void);
-
+  
   private:
     ClientRequestInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ClientRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
+    
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _nil (void)
       {
         return (ClientRequestInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_request (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1251,7 +1466,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_poll (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1259,7 +1477,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_reply (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1267,7 +1488,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_exception (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1276,7 +1500,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1285,58 +1512,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ClientRequestInterceptor (void);
-
     virtual ~ClientRequestInterceptor (void);
-
+    
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
     void operator= (const ClientRequestInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_
-
+  
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ServerRequestInterceptor_var (void); // default constructor
-    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {}
+    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
     ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
     ~ServerRequestInterceptor_var (void); // destructor
-
+    
     ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
     ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
     ServerRequestInterceptor_ptr operator-> (void) const;
-
+    
     operator const ServerRequestInterceptor_ptr &() const;
     operator ServerRequestInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerRequestInterceptor_ptr in (void) const;
     ServerRequestInterceptor_ptr &inout (void);
     ServerRequestInterceptor_ptr &out (void);
     ServerRequestInterceptor_ptr _retn (void);
     ServerRequestInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr);
@@ -1347,7 +1585,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1355,13 +1593,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ServerRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ServerRequestInterceptor_out
   {
   public:
@@ -1374,47 +1613,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInterceptor_ptr &();
     ServerRequestInterceptor_ptr &ptr (void);
     ServerRequestInterceptor_ptr operator-> (void);
-
+  
   private:
     ServerRequestInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ServerRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerRequestInterceptor_ptr _ptr_type;
     typedef ServerRequestInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-
+    
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _nil (void)
       {
         return (ServerRequestInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1423,7 +1665,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_request (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1432,7 +1677,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_reply (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1440,7 +1688,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_exception (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1449,7 +1700,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1458,58 +1712,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServerRequestInterceptor (void);
-
     virtual ~ServerRequestInterceptor (void);
-
+    
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
     void operator= (const ServerRequestInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_
-
+  
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export IORInfo_var : public TAO_Base_var
   {
   public:
     IORInfo_var (void); // default constructor
-    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {}
+    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
     IORInfo_var (const IORInfo_var &); // copy constructor
     ~IORInfo_var (void); // destructor
-
+    
     IORInfo_var &operator= (IORInfo_ptr);
     IORInfo_var &operator= (const IORInfo_var &);
     IORInfo_ptr operator-> (void) const;
-
+    
     operator const IORInfo_ptr &() const;
     operator IORInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IORInfo_ptr in (void) const;
     IORInfo_ptr &inout (void);
     IORInfo_ptr &out (void);
     IORInfo_ptr _retn (void);
     IORInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInfo_ptr tao_duplicate (IORInfo_ptr);
@@ -1520,7 +1785,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IORInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1528,13 +1793,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     IORInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export IORInfo_out
   {
   public:
@@ -1547,47 +1813,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInfo_ptr &();
     IORInfo_ptr &ptr (void);
     IORInfo_ptr operator-> (void);
-
+  
   private:
     IORInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
-
+  
   class TAO_Export IORInfo
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORInfo_ptr _ptr_type;
     typedef IORInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-
+    
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _nil (void)
       {
         return (IORInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_effective_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1595,56 +1864,73 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component (
-        const IOP::TaggedComponent & component
+        const IOP::TaggedComponent & a_component
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component_to_profile (
-        const IOP::TaggedComponent & component,
+        const IOP::TaggedComponent & a_component,
         IOP::ProfileId profile_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterManagerId manager_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterState state (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void current_factory (
         PortableInterceptor::ObjectReferenceFactory * current_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1652,58 +1938,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IORInfo (void);
-
     virtual ~IORInfo (void);
-
+    
   private:
     IORInfo (const IORInfo &);
     void operator= (const IORInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_
-
+  
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export IORInterceptor_var : public TAO_Base_var
   {
   public:
     IORInterceptor_var (void); // default constructor
-    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {}
+    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
     IORInterceptor_var (const IORInterceptor_var &); // copy constructor
     ~IORInterceptor_var (void); // destructor
-
+    
     IORInterceptor_var &operator= (IORInterceptor_ptr);
     IORInterceptor_var &operator= (const IORInterceptor_var &);
     IORInterceptor_ptr operator-> (void) const;
-
+    
     operator const IORInterceptor_ptr &() const;
     operator IORInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IORInterceptor_ptr in (void) const;
     IORInterceptor_ptr &inout (void);
     IORInterceptor_ptr &out (void);
     IORInterceptor_ptr _retn (void);
     IORInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
@@ -1714,7 +2011,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IORInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1722,13 +2019,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     IORInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export IORInterceptor_out
   {
   public:
@@ -1741,47 +2039,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInterceptor_ptr &();
     IORInterceptor_ptr &ptr (void);
     IORInterceptor_ptr operator-> (void);
-
+  
   private:
     IORInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-
+  
   class TAO_Export IORInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORInterceptor_ptr _ptr_type;
     typedef IORInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-
+    
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _nil (void)
       {
         return (IORInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void establish_components (
         PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1789,7 +2090,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void components_established (
         PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1797,7 +2101,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_manager_state_changed (
         PortableInterceptor::AdapterManagerId id,
         PortableInterceptor::AdapterState state
@@ -1806,7 +2113,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_state_changed (
         const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
         PortableInterceptor::AdapterState state
@@ -1815,58 +2125,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IORInterceptor (void);
-
     virtual ~IORInterceptor (void);
-
+    
   private:
     IORInterceptor (const IORInterceptor &);
     void operator= (const IORInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_
-
+  
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PolicyFactory_var : public TAO_Base_var
   {
   public:
     PolicyFactory_var (void); // default constructor
-    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {}
+    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
     PolicyFactory_var (const PolicyFactory_var &); // copy constructor
     ~PolicyFactory_var (void); // destructor
-
+    
     PolicyFactory_var &operator= (PolicyFactory_ptr);
     PolicyFactory_var &operator= (const PolicyFactory_var &);
     PolicyFactory_ptr operator-> (void) const;
-
+    
     operator const PolicyFactory_ptr &() const;
     operator PolicyFactory_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PolicyFactory_ptr in (void) const;
     PolicyFactory_ptr &inout (void);
     PolicyFactory_ptr &out (void);
     PolicyFactory_ptr _retn (void);
     PolicyFactory_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr);
@@ -1877,7 +2198,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PolicyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1885,13 +2206,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     PolicyFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PolicyFactory_out
   {
   public:
@@ -1904,47 +2226,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator PolicyFactory_ptr &();
     PolicyFactory_ptr &ptr (void);
     PolicyFactory_ptr operator-> (void);
-
+  
   private:
     PolicyFactory_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-
+  
   class TAO_Export PolicyFactory
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyFactory_ptr _ptr_type;
     typedef PolicyFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-
+    
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _nil (void)
       {
         return (PolicyFactory_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr create_policy (
         CORBA::PolicyType type,
         const CORBA::Any & value
@@ -1954,67 +2279,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , CORBA::PolicyError
       )) = 0;
-
-    virtual ::CORBA::Policy_ptr _create_policy (
-        CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PolicyError
-      ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PolicyFactory (void);
-
     virtual ~PolicyFactory (void);
-
+    
   private:
     PolicyFactory (const PolicyFactory &);
     void operator= (const PolicyFactory &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_
-
+  
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ORBInitInfo_var : public TAO_Base_var
   {
   public:
     ORBInitInfo_var (void); // default constructor
-    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {}
+    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
     ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
     ~ORBInitInfo_var (void); // destructor
-
+    
     ORBInitInfo_var &operator= (ORBInitInfo_ptr);
     ORBInitInfo_var &operator= (const ORBInitInfo_var &);
     ORBInitInfo_ptr operator-> (void) const;
-
+    
     operator const ORBInitInfo_ptr &() const;
     operator ORBInitInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ORBInitInfo_ptr in (void) const;
     ORBInitInfo_ptr &inout (void);
     ORBInitInfo_ptr &out (void);
     ORBInitInfo_ptr _retn (void);
     ORBInitInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr);
@@ -2025,7 +2352,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ORBInitInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2033,13 +2360,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ORBInitInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ORBInitInfo_out
   {
   public:
@@ -2052,65 +2380,78 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ORBInitInfo_ptr &();
     ORBInitInfo_ptr &ptr (void);
     ORBInitInfo_ptr operator-> (void);
-
+  
   private:
     ORBInitInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-
+  
   class TAO_Export ORBInitInfo
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ORBInitInfo_ptr _ptr_type;
     typedef ORBInitInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-
+    
     static ORBInitInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _nil (void)
       {
         return (ORBInitInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+    
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
     typedef CORBA::String_out ObjectId_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ObjectId;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-
+    
     class TAO_Export DuplicateName : public CORBA::UserException
     {
     public:
+      
       TAO_String_Manager name;
-
       DuplicateName (void);
       DuplicateName (const DuplicateName &);
       ~DuplicateName (void);
 
       DuplicateName &operator= (const DuplicateName &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static DuplicateName *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2122,35 +2463,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-            DuplicateName (
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+      
+      DuplicateName (
           const char * _tao_name
         );
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_DuplicateName;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-
+    
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
-
+      
       InvalidName (void);
       InvalidName (const InvalidName &);
       ~InvalidName (void);
 
       InvalidName &operator= (const InvalidName &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static InvalidName *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2162,42 +2518,58 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_InvalidName;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StringSeq * arguments (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * orb_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::CodecFactory_ptr codec_factory (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_initial_reference (
         const char * id,
         CORBA::Object_ptr obj
@@ -2207,7 +2579,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr resolve_initial_references (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2216,7 +2591,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_client_request_interceptor (
         PortableInterceptor::ClientRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2225,7 +2603,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_server_request_interceptor (
         PortableInterceptor::ServerRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2234,7 +2615,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_interceptor (
         PortableInterceptor::IORInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2243,15 +2627,20 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::SlotId allocate_slot_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_policy_factory (
         CORBA::PolicyType type,
         PortableInterceptor::PolicyFactory_ptr policy_factory
@@ -2260,64 +2649,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ORBInitInfo (void);
-
     virtual ~ORBInitInfo (void);
-
+    
   private:
     ORBInitInfo (const ORBInitInfo &);
     void operator= (const ORBInitInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_
-
+  
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
 
-  /// Register an ORBInitializer with the global ORBInitializer
-  /// table.
-  TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
-      ORBInitializer_ptr init
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ORBInitializer_var : public TAO_Base_var
   {
   public:
     ORBInitializer_var (void); // default constructor
-    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {}
+    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
     ORBInitializer_var (const ORBInitializer_var &); // copy constructor
     ~ORBInitializer_var (void); // destructor
-
+    
     ORBInitializer_var &operator= (ORBInitializer_ptr);
     ORBInitializer_var &operator= (const ORBInitializer_var &);
     ORBInitializer_ptr operator-> (void) const;
-
+    
     operator const ORBInitializer_ptr &() const;
     operator ORBInitializer_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ORBInitializer_ptr in (void) const;
     ORBInitializer_ptr &inout (void);
     ORBInitializer_ptr &out (void);
     ORBInitializer_ptr _retn (void);
     ORBInitializer_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr);
@@ -2328,7 +2722,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ORBInitializer_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2336,13 +2730,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ORBInitializer_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ORBInitializer_out
   {
   public:
@@ -2355,47 +2750,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ORBInitializer_ptr &();
     ORBInitializer_ptr &ptr (void);
     ORBInitializer_ptr operator-> (void);
-
+  
   private:
     ORBInitializer_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
-
+  
   class TAO_Export ORBInitializer
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ORBInitializer_ptr _ptr_type;
     typedef ORBInitializer_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-
+    
     static ORBInitializer_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _nil (void)
       {
         return (ORBInitializer_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void pre_init (
         PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2403,7 +2801,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void post_init (
         PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2411,58 +2812,177 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ORBInitializer (void);
-
     virtual ~ORBInitializer (void);
-
+    
   private:
     ORBInitializer (const ORBInitializer &);
     void operator= (const ORBInitializer &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
-TAO_NAMESPACE  OBV_PortableInterceptor
-{
-}
-TAO_NAMESPACE_CLOSE
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_NAMESPACE  OBV_Messaging
-{
-}
-TAO_NAMESPACE_CLOSE
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
@@ -2478,3 +2998,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index 0874ea77d99..b1528e1d8f8 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -20,145 +20,262 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ForwardRequest
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableInterceptor::InvalidSlot
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_)
 #define _PORTABLEINTERCEPTOR_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
 #define _PORTABLEINTERCEPTOR_IORINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ORBInitInfo::DuplicateName
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ORBInitInfo::InvalidName
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ForwardRequest &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ForwardRequest &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.forward.in ()) &&
-      (strm << CORBA::Any::from_boolean (_tao_aggregate.permanent))
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.forward.in ()) &&
+        (strm << CORBA::Any::from_boolean (_tao_aggregate.permanent))
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableInterceptor::ForwardRequest &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ForwardRequest &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.forward.out ()) &&
     (strm >> CORBA::Any::to_boolean (_tao_aggregate.permanent))
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::InvalidSlot &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::InvalidSlot &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableInterceptor::InvalidSlot&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableInterceptor::InvalidSlot&
+  )
 {
   return 1;
 }
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 11c0f2c28e7..d1941884fd2 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -10,7 +10,7 @@ TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 }
 
 int
-TAO_Default_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                            TAO_MProfile &mprofile,
                                            TAO_Acceptor **acceptors_begin,
                                            TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 3b46c48a4f0..91a47a64fb4 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -50,7 +50,7 @@ public:
   TAO_Default_Acceptor_Filter (void);
 
   /// Populate <mprofile> with all available endpoints.
-  int fill_profile (const TAO_ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 51e61927977..8912ef09302 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -297,7 +297,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 }
 
 int
-TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
+TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
                                       TAO_ServerRequest &req,
                                       CORBA::Object_out forward_to
                                       ACE_ENV_ARG_DECL)
@@ -340,7 +340,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
 }
 
 void
-TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
+TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
                                 TAO_POA *&poa
                                 ACE_ENV_ARG_DECL)
@@ -501,7 +501,7 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
 }
 
 int
-TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
+TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
                                       ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
@@ -536,7 +536,7 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
 }
 
 TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
+TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
                                     PortableServer::Servant &servant
                                     ACE_ENV_ARG_DECL)
 {
@@ -702,7 +702,7 @@ TAO_Object_Adapter::priority (void) const
 }
 
 int
-TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
+TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                               TAO_ServerRequest &request,
                               CORBA::Object_out forward_to
                               ACE_ENV_ARG_DECL)
@@ -1215,7 +1215,7 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
 }
 
 int
-TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key,
+TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO::ObjectKey &key,
                                                         const char *operation,
                                                         CORBA::Object_out forward_to
                                                         ACE_ENV_ARG_DECL)
@@ -1353,7 +1353,7 @@ TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
 }
 
 TAO_POA *
-TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key
+TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
                                                 ACE_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
@@ -1648,7 +1648,7 @@ TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
 
 void
 TAO_POA_Current_Impl::setup (TAO_POA *p,
-                             const TAO_ObjectKey &key)
+                             const TAO::ObjectKey &key)
 {
   // Remember information about this upcall.
   this->poa_ = p;
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index b1896fd4448..6eaa93b66b7 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -152,10 +152,10 @@ public:
   const PortableServer::ObjectId &object_id (void) const;
 
   /// Set the object key.
-  void object_key (const TAO_ObjectKey &key);
+  void object_key (const TAO::ObjectKey &key);
 
   /// Get the object key.
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// Set the servant for the current upcall.
   void servant (PortableServer::Servant servant);
@@ -177,7 +177,7 @@ public:
 
   /// Setup the current.
   void setup (TAO_POA *impl,
-              const TAO_ObjectKey &key);
+              const TAO::ObjectKey &key);
 
 protected:
   /// The POA implementation invoking an upcall
@@ -191,7 +191,7 @@ protected:
   PortableServer::ObjectId object_id_;
 
   /// The object key of the current context.
-  const TAO_ObjectKey *object_key_;
+  const TAO::ObjectKey *object_key_;
 
   /// The servant for the current upcall.
   PortableServer::Servant servant_;
@@ -238,15 +238,15 @@ public:
   /// Destructor.
   ~TAO_Object_Adapter (void);
 
-  int dispatch_servant (const TAO_ObjectKey &key,
+  int dispatch_servant (const TAO::ObjectKey &key,
                         TAO_ServerRequest &req,
                         CORBA::Object_out forward_to
                         ACE_ENV_ARG_DECL);
 
-  int locate_servant (const TAO_ObjectKey &key
+  int locate_servant (const TAO::ObjectKey &key
                       ACE_ENV_ARG_DECL);
 
-  TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
+  TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key,
                                      PortableServer::Servant &servant
                                      ACE_ENV_ARG_DECL);
 
@@ -312,7 +312,7 @@ public:
   virtual void check_close (int wait_for_completion
                             ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
                         ACE_ENV_ARG_DECL)
@@ -324,19 +324,19 @@ public:
 
 protected:
 
-  int locate_servant_i (const TAO_ObjectKey &key
+  int locate_servant_i (const TAO::ObjectKey &key
                         ACE_ENV_ARG_DECL);
 
-  TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
+  TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key,
                                        PortableServer::Servant &servant
                                        ACE_ENV_ARG_DECL);
 
-  void dispatch_servant_i (const TAO_ObjectKey &key,
+  void dispatch_servant_i (const TAO::ObjectKey &key,
                            TAO_ServerRequest &req,
                            void *context
                            ACE_ENV_ARG_DECL);
 
-  void locate_poa (const TAO_ObjectKey &key,
+  void locate_poa (const TAO::ObjectKey &key,
                    PortableServer::ObjectId &id,
                    TAO_POA *&poa
                    ACE_ENV_ARG_DECL);
@@ -686,7 +686,7 @@ public:
     ~Servant_Upcall (void);
 
     /// Locate POA and servant.
-    int prepare_for_upcall (const TAO_ObjectKey &key,
+    int prepare_for_upcall (const TAO::ObjectKey &key,
                             const char *operation,
                             CORBA::Object_out forward_to
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -702,7 +702,7 @@ public:
     void post_invoke (void);
 
     /// Locate POA.
-    TAO_POA *lookup_POA (const TAO_ObjectKey &key
+    TAO_POA *lookup_POA (const TAO::ObjectKey &key
                          ACE_ENV_ARG_DECL);
 
     /// POA accessor.
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index fda2e2938d6..d65dd572700 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -2790,7 +2790,7 @@ TAO_POA::locate_servant_i (const char *operation,
 
 /* static */
 int
-TAO_POA::parse_key (const TAO_ObjectKey &key,
+TAO_POA::parse_key (const TAO::ObjectKey &key,
                     TAO_Object_Adapter::poa_name &poa_system_name,
                     PortableServer::ObjectId &system_id,
                     CORBA::Boolean &is_root,
@@ -2926,7 +2926,7 @@ TAO_POA::parse_key (const TAO_ObjectKey &key,
   return 0;
 }
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 {
   // Calculate the space required for the key.
@@ -2935,7 +2935,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id)
     id.length ();
 
   // Create the buffer for the key.
-  CORBA::Octet *buffer = TAO_ObjectKey::allocbuf (buffer_size);
+  CORBA::Octet *buffer = TAO::ObjectKey::allocbuf (buffer_size);
 
   // First copy the POA id into the key.
   ACE_OS::memcpy (&buffer[0],
@@ -2949,9 +2949,9 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 
   // Create the key, giving the ownership of the buffer to the
   // sequence.
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (buffer_size,
+                  TAO::ObjectKey (buffer_size,
                                  buffer_size,
                                  buffer,
                                  1),
@@ -3248,7 +3248,7 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
 }
 
 int
-TAO_POA::parse_ir_object_key (const TAO_ObjectKey &object_key,
+TAO_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
                               PortableServer::ObjectId &user_id)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
@@ -3431,7 +3431,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
 }
 
 CORBA::Object_ptr
-TAO_POA::key_to_object (const TAO_ObjectKey &key,
+TAO_POA::key_to_object (const TAO::ObjectKey &key,
                         const char *type_id,
                         TAO_ServantBase *servant,
                         CORBA::Boolean collocated,
@@ -3501,7 +3501,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
       // Add the key.
 
       CORBA::String_var key_str;
-      TAO_ObjectKey::encode_sequence_to_string (key_str.inout (), key);
+      TAO::ObjectKey::encode_sequence_to_string (key_str.inout (), key);
 
       ior += key_str.in ();
 
@@ -3558,7 +3558,7 @@ orbkey:
 }
 
 TAO_Stub *
-TAO_POA::key_to_stub (const TAO_ObjectKey &key,
+TAO_POA::key_to_stub (const TAO::ObjectKey &key,
                       const char *type_id,
                       CORBA::Short priority
                       ACE_ENV_ARG_DECL)
@@ -3573,7 +3573,7 @@ TAO_POA::key_to_stub (const TAO_ObjectKey &key,
 }
 
 TAO_Stub *
-TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
+TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
                         const char *type_id,
                         CORBA::Short priority
                         ACE_ENV_ARG_DECL)
@@ -3745,7 +3745,7 @@ save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
 }
 
 TAO_Stub *
-TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
+TAO_POA::create_stub_object (const TAO::ObjectKey &object_key,
                              const char *type_id,
                              CORBA::PolicyList *policy_list,
                              TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index 2037908841a..e98c343b561 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -13,10 +13,10 @@ TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   PortableServer::ObjectId_var invalid_oid =
     PortableServer::string_to_ObjectId ("invalid");
 
-  TAO_ObjectKey tmp_key (invalid_oid->length (),
-                         invalid_oid->length (),
-                         invalid_oid->get_buffer (),
-                         0);
+  TAO::ObjectKey tmp_key (invalid_oid->length (),
+                          invalid_oid->length (),
+                          invalid_oid->get_buffer (),
+                          0);
 
   // It is ok to use TAO_ORB_Core_instance here since the locality
   // constrained servant does not really register with a POA or get
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index a2735761762..cf15560324d 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -408,15 +408,15 @@ TAO_Unknown_Profile::encode_endpoints (void)
   return 0;
 }
 
-const TAO_ObjectKey &
+const TAO::ObjectKey &
 TAO_Unknown_Profile::object_key (void) const
 {
   // @@ TODO this is wrong, but the function is deprecated anyway....
-  static TAO_ObjectKey empty_key;
+  static TAO::ObjectKey empty_key;
   return empty_key;
 }
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 TAO_Unknown_Profile::_key (void) const
 {
   return 0;
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index a1fb45772ba..884fa808283 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -107,11 +107,11 @@ public:
   virtual int encode_endpoints (void) = 0;
 
   /// @@ deprecated. return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const = 0;
+  virtual const TAO::ObjectKey &object_key (void) const = 0;
 
   /// Obtain the object key, return 0 if the profile cannot be parsed.
   /// The memory is owned by the caller!
-  virtual TAO_ObjectKey *_key (void) const = 0;
+  virtual TAO::ObjectKey *_key (void) const = 0;
 
   /**
    * Return pointer to this profile's endpoint.  If the profile
@@ -291,8 +291,8 @@ public:
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual int encode_endpoints (void);
-  virtual const TAO_ObjectKey &object_key (void) const;
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
   virtual TAO_Endpoint *endpoint (void);
   virtual size_t endpoint_count (void);
   virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index 8efbd23665c..7a4e179e5e5 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -20,7 +20,7 @@ TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
 }
 
 int
-TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                                    TAO_MProfile &mprofile,
                                                    TAO_Acceptor **acceptors_begin,
                                                    TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
index f4b93d409ea..8324da9e0f5 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -59,7 +59,7 @@ public:
   TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols);
 
   /// Populate <mprofile> based on what's in <protocols_>.
-  int fill_profile (const TAO_ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 7b014b72105..7bcbfed2c6b 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -223,7 +223,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 TAO_Stub *
-TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
+TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                            const char *type_id,
                            CORBA::Short priority
                            ACE_ENV_ARG_DECL)
@@ -318,7 +318,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
 }
 
 TAO_Stub *
-TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
+TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 7638c55aec9..bf066bfbed0 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -285,7 +285,7 @@ protected:
                             TAO_Object_Adapter *object_adapter
                             ACE_ENV_ARG_DECL);
 
-  virtual TAO_Stub *key_to_stub_i (const TAO_ObjectKey &key,
+  virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
@@ -302,7 +302,7 @@ protected:
 
   size_t endpoint_count (void);
 
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 4052ad5ce34..1dbd19b00f3 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -50,7 +50,7 @@ TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
 //    2) For V1.[1,2] there are tagged components
 
 int
-TAO_DIOP_Acceptor::create_profile (const TAO_ObjectKey & object_key,
+TAO_DIOP_Acceptor::create_profile (const TAO::ObjectKey & object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -71,7 +71,7 @@ TAO_DIOP_Acceptor::create_profile (const TAO_ObjectKey & object_key,
 }
 
 int
-TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_DIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -123,7 +123,7 @@ TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_DIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -616,7 +616,7 @@ TAO_DIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index a700a16ef8d..e933af2019a 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -74,7 +74,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -82,7 +82,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
   /**
@@ -132,13 +132,13 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 protected:
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 41401ee8b9c..482890a4eed 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -33,7 +33,7 @@ TAO_DIOP_Profile::object_key_delimiter (void) const
 
 
 TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UDP_PROFILE, orb_core, version),
@@ -47,7 +47,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
 
 TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -293,7 +293,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
     }
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
 }
 
 CORBA::Boolean
@@ -377,7 +377,7 @@ char *
 TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 0a1263c8d51..1715deccb57 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -57,7 +57,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
@@ -65,7 +65,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_DIOP_Profile (const char *host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_INET_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -117,11 +117,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -190,7 +190,7 @@ protected:
 private:
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/DIOP_Profile.i b/TAO/tao/Strategies/DIOP_Profile.i
index 2c18a75ae92..a6488c3da80 100644
--- a/TAO/tao/Strategies/DIOP_Profile.i
+++ b/TAO/tao/Strategies/DIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_DIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_DIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 2072e61a650..cec44348d8f 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -74,7 +74,7 @@ TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
 //       interfaces over which we can receive requests.  Thus a profile
 //       must be made for each one.
 int
-TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                      TAO_MProfile &mprofile,
                                      CORBA::Short priority)
 {
@@ -91,7 +91,7 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                          TAO_MProfile &mprofile,
                                          CORBA::Short priority)
 {
@@ -140,7 +140,7 @@ TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_SHMIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                             TAO_MProfile &mprofile,
                                             CORBA::Short priority)
 {
@@ -363,7 +363,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
 
 int
 TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                                 TAO_ObjectKey &object_key)
+                                 TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index b5d2e99dff9..89dd2f38a55 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -75,7 +75,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -83,7 +83,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
   /// Set the MMAP options the MEM_Stream this acceptor creates will
@@ -100,12 +100,12 @@ private:
   virtual int parse_options (const char *options);
 
   /// Create a SHMIOP profile representing this acceptor.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 99bb7f2f3b8..8fdb9b608e0 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -31,7 +31,7 @@ TAO_SHMIOP_Profile::object_key_delimiter (void) const
 }
 
 TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                                        const TAO_ObjectKey &object_key,
+                                        const TAO::ObjectKey &object_key,
                                         const TAO_GIOP_Message_Version &version,
                                         TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_SHMEM_PROFILE, orb_core, version),
@@ -45,7 +45,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
 
 TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const char* host,
                                         CORBA::UShort port,
-                                        const TAO_ObjectKey &object_key,
+                                        const TAO::ObjectKey &object_key,
                                         const ACE_INET_Addr &addr,
                                         const TAO_GIOP_Message_Version &version,
                                         TAO_ORB_Core *orb_core)
@@ -321,7 +321,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
 
   start = ++okd;  // increment past the object key separator
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, start);
 }
 
 CORBA::Boolean
@@ -392,7 +392,7 @@ char *
 TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                              this->object_key_);
 
   u_int buflen = (8 /* corbaloc */ +
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3c132cb42a3..8511aae5a68 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -57,7 +57,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                      const TAO_ObjectKey &object_key,
+                      const TAO::ObjectKey &object_key,
                       const TAO_GIOP_Message_Version &version,
                       TAO_ORB_Core *orb_core);
 
@@ -65,7 +65,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_SHMIOP_Profile (const char *host,
                       CORBA::UShort port,
-                      const TAO_ObjectKey &object_key,
+                      const TAO::ObjectKey &object_key,
                       const ACE_INET_Addr &addr,
                       const TAO_GIOP_Message_Version &version,
                       TAO_ORB_Core *orb_core);
@@ -111,11 +111,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  TAO_ObjectKey *_key (void) const;
+  TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -179,7 +179,7 @@ private:
   size_t count_;
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// The tagged profile info
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.i b/TAO/tao/Strategies/SHMIOP_Profile.i
index 077e9117286..81c3adbedb7 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.i
+++ b/TAO/tao/Strategies/SHMIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_SHMIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_SHMIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO_ObjeTAO::ObjectKeyctKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 3cb769777e0..45925a1384f 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -81,7 +81,7 @@ TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
 }
 
 int
-TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -99,7 +99,7 @@ TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -148,7 +148,7 @@ TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_UIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -391,7 +391,7 @@ TAO_UIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_UIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 1fc411100d4..ca101018629 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -77,7 +77,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -85,7 +85,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
 private:
@@ -105,12 +105,12 @@ private:
   int init_uiop_properties (void);
 
   /// Create a UIOP profile representing this acceptor.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 769dca3b406..ce7894cd16d 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -33,7 +33,7 @@ TAO_UIOP_Profile::object_key_delimiter (void) const
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UIOP_PROFILE, orb_core, version),
@@ -45,7 +45,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const char *,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_UNIX_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -171,7 +171,7 @@ TAO_UIOP_Profile::parse_string (const char *string
 
   start = ++cp;  // increment past the object key separator
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, start);
 }
 
 CORBA::Boolean
@@ -243,7 +243,7 @@ char *
 TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 9a7e62ca90f..f122fe3feba 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -58,13 +58,13 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.  (actually, no marshalling for this protocol)
   TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
   /// Profile constructor
   TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_UNIX_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -110,11 +110,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -178,7 +178,7 @@ private:
   size_t count_;
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile info
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/UIOP_Profile.i b/TAO/tao/Strategies/UIOP_Profile.i
index 3c14e09b1e3..e55f4927fc4 100644
--- a/TAO/tao/Strategies/UIOP_Profile.i
+++ b/TAO/tao/Strategies/UIOP_Profile.i
@@ -3,19 +3,19 @@
 
 # if TAO_HAS_UIOP == 1
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_UIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_UIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index 3d2c69a9102..d3cabd03271 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -8,9 +8,9 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//       -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
+//          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
 //          StringSeq.pidl
@@ -31,6 +31,4 @@ module CORBA
   typedef sequence<wstring> WStringSeq;
 };
 
-#pragma prefix ""
-
 #endif  /* TAO_CORBA_STRING_SEQ_IDL */
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 2cbe38ae513..80cfaca1bed 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "StringSeqC.h"
 
 #if defined (__BORLANDC__)
@@ -29,408 +33,474 @@
 #include "StringSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "Any_T.h"
 
 #if !defined (_CORBA_STRINGSEQ_CS_)
 #define _CORBA_STRINGSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::StringSeq
 // *************************************************************
 
-CORBA_StringSeq::CORBA_StringSeq (void)
+CORBA::StringSeq::StringSeq (void)
 {}
-CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::StringSeq::StringSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  :
+
+CORBA::StringSeq::StringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    char * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &seq) // copy ctor
-  :
+
+CORBA::StringSeq::StringSeq (const StringSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
-CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
+
+CORBA::StringSeq::~StringSeq (void) // dtor
 {}
-void CORBA_StringSeq::_tao_any_destructor (void *x)
+
+void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_StringSeq *tmp = ACE_static_cast (CORBA_StringSeq*,x);
+  StringSeq *tmp = ACE_static_cast (StringSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_StringSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+    10,
+  ACE_NTOHL (0x53747269), 
+  ACE_NTOHL (0x6e675365), 
+  ACE_NTOHL (0x71000000),  // name = StringSeq
+    CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_StringSeq),
+    (char *) &_oc_CORBA_StringSeq,
+    0,
+    sizeof (CORBA::StringSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_StringSeq,
+    &_tc_TAO_tc_CORBA_StringSeq
+  )
 TAO_NAMESPACE_END
 
 #if !defined (_CORBA_WSTRINGSEQ_CS_)
 #define _CORBA_WSTRINGSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::WStringSeq
 // *************************************************************
 
-CORBA_WStringSeq::CORBA_WStringSeq (void)
+CORBA::WStringSeq::WStringSeq (void)
 {}
-CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::WStringSeq::WStringSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-  :
+
+CORBA::WStringSeq::WStringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::WChar * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
-  :
+
+CORBA::WStringSeq::WStringSeq (const WStringSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
-CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
+
+CORBA::WStringSeq::~WStringSeq (void) // dtor
 {}
-void CORBA_WStringSeq::_tao_any_destructor (void *x)
+
+void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_WStringSeq *tmp = ACE_static_cast (CORBA_WStringSeq*,x);
+  WStringSeq *tmp = ACE_static_cast (WStringSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_WStringSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5753), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
-  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = WStringSeq
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5753), 
+  ACE_NTOHL (0x7472696e), 
+  ACE_NTOHL (0x67536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
+    11,
+  ACE_NTOHL (0x57537472), 
+  ACE_NTOHL (0x696e6753), 
+  ACE_NTOHL (0x65710000),  // name = WStringSeq
+    CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring,
+    CORBA::tk_wstring, 
     0U, // string length
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_WStringSeq),
+    (char *) &_oc_CORBA_WStringSeq,
+    0,
+    sizeof (CORBA::WStringSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_WStringSeq,
+    &_tc_TAO_tc_CORBA_WStringSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_StringSeq &_tao_elem
-  ) // copying
+    const CORBA::StringSeq &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_StringSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
+      _tao_any,
+      CORBA::StringSeq::_tao_any_destructor,
+      CORBA::_tc_StringSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
+      _tao_any,
+      CORBA::StringSeq::_tao_any_destructor,
       CORBA::_tc_StringSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA_StringSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StringSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA_StringSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::StringSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StringSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA_StringSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA_StringSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_StringSeq, 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_StringSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA_StringSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
+        _tao_any,
+        CORBA::StringSeq::_tao_any_destructor,
+        CORBA::_tc_StringSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_WStringSeq &_tao_elem
-  ) // copying
+    const CORBA::WStringSeq &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_WStringSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
+      _tao_any,
+      CORBA::WStringSeq::_tao_any_destructor,
+      CORBA::_tc_WStringSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WStringSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
+      _tao_any,
+      CORBA::WStringSeq::_tao_any_destructor,
       CORBA::_tc_WStringSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA_WStringSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WStringSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WStringSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA_WStringSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::WStringSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::WStringSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_WStringSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA_WStringSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA_WStringSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_WStringSeq, 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_WStringSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA_WStringSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
+        _tao_any,
+        CORBA::WStringSeq::_tao_any_destructor,
+        CORBA::_tc_WStringSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_StringSeq &_tao_sequence
+    const CORBA::StringSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_StringSeq &_tao_sequence
+    CORBA::StringSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_WStringSeq &_tao_sequence
+    const CORBA::WStringSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_WStringSeq &_tao_sequence
+    CORBA::WStringSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
+
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 64f43fb52dd..c5c7939b741 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
-#define _TAO_IDL_CORBA_STRINGSEQC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
+#define _TAO_IDL_ORIG_STRINGSEQC_H_
 
 #include "ace/pre.h"
 
@@ -55,264 +58,322 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+
 #if !defined (_CORBA_STRINGSEQ_CH_)
 #define _CORBA_STRINGSEQ_CH_
-
-  class CORBA_StringSeq;
-  class CORBA_StringSeq_var;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class StringSeq;
+  class StringSeq_var;
   
   // *************************************************************
   // CORBA::StringSeq
   // *************************************************************
   
-  class TAO_Export CORBA_StringSeq : public 
+  class TAO_Export StringSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    CORBA_StringSeq (void); // default ctor
-    CORBA_StringSeq (CORBA::ULong max); // uses max size
-    CORBA_StringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
-    ~CORBA_StringSeq (void);
+    StringSeq (void);
+    StringSeq (CORBA::ULong max);
+    StringSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
+        CORBA::Boolean release = 0
+      );
+    StringSeq (const StringSeq &);
+    ~StringSeq (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_StringSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    typedef StringSeq_var _var_type;
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_STRINGSEQ___VAR_CH_)
 #define _CORBA_STRINGSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::StringSeq_var
   // *************************************************************
-
-  class TAO_Export CORBA_StringSeq_var
+  
+  class TAO_Export StringSeq_var
   {
   public:
-    CORBA_StringSeq_var (void); // default constructor
-    CORBA_StringSeq_var (CORBA_StringSeq *);
-    CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
-    ~CORBA_StringSeq_var (void); // destructor
+    StringSeq_var (void);
+    StringSeq_var (StringSeq *);
+    StringSeq_var (const StringSeq_var &);
+    ~StringSeq_var (void);
     
-    CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
-    CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
-    CORBA_StringSeq *operator-> (void);
-    const CORBA_StringSeq *operator-> (void) const;
+    StringSeq_var &operator= (StringSeq *);
+    StringSeq_var &operator= (const StringSeq_var &);
+    StringSeq *operator-> (void);
+    const StringSeq *operator-> (void) const;
     
-    operator const CORBA_StringSeq &() const;
-    operator CORBA_StringSeq &();
-    operator CORBA_StringSeq &() const;
-    operator CORBA_StringSeq *&(); // variable-size base types only
+    operator const StringSeq &() const;
+    operator StringSeq &();
+    operator StringSeq &() const;
+    
+    // Variable-size base types only.
+    operator StringSeq *&();
     
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
     
     // in, inout, out, _retn 
-    const CORBA_StringSeq &in (void) const;
-    CORBA_StringSeq &inout (void);
-    CORBA_StringSeq *&out (void);
-    CORBA_StringSeq *_retn (void);
-    CORBA_StringSeq *ptr (void) const;
-
+    const StringSeq &in (void) const;
+    StringSeq &inout (void);
+    StringSeq *&out (void);
+    StringSeq *_retn (void);
+    StringSeq *ptr (void) const;
+  
   private:
-    CORBA_StringSeq *ptr_;
+    StringSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
 #define _CORBA_STRINGSEQ___OUT_CH_
-
-  class TAO_Export CORBA_StringSeq_out
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export StringSeq_out
   {
   public:
-    CORBA_StringSeq_out (CORBA_StringSeq *&);
-    CORBA_StringSeq_out (CORBA_StringSeq_var &);
-    CORBA_StringSeq_out (const CORBA_StringSeq_out &);
-    CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
-    CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
-    operator CORBA_StringSeq *&();
-    CORBA_StringSeq *&ptr (void);
-    CORBA_StringSeq *operator-> (void);
+    StringSeq_out (StringSeq *&);
+    StringSeq_out (StringSeq_var &);
+    StringSeq_out (const StringSeq_out &);
+    StringSeq_out &operator= (const StringSeq_out &);
+    StringSeq_out &operator= (StringSeq *);
+    operator StringSeq *&();
+    StringSeq *&ptr (void);
+    StringSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
+  
   private:
-    CORBA_StringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_StringSeq_var &);
+    StringSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const StringSeq_var &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq;
 
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
-
-  class CORBA_WStringSeq;
-  class CORBA_WStringSeq_var;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class WStringSeq;
+  class WStringSeq_var;
   
   // *************************************************************
   // CORBA::WStringSeq
   // *************************************************************
   
-  class TAO_Export CORBA_WStringSeq : public 
+  class TAO_Export WStringSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_WString_Sequence
+  TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_WString_Sequence
+  TAO_Unbounded_WString_Sequence
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    CORBA_WStringSeq (void); // default ctor
-    CORBA_WStringSeq (CORBA::ULong max); // uses max size
-    CORBA_WStringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::WChar * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
-    ~CORBA_WStringSeq (void);
+    WStringSeq (void);
+    WStringSeq (CORBA::ULong max);
+    WStringSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::WChar * *buffer, 
+        CORBA::Boolean release = 0
+      );
+    WStringSeq (const WStringSeq &);
+    ~WStringSeq (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_WStringSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    typedef WStringSeq_var _var_type;
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_WSTRINGSEQ___VAR_CH_)
 #define _CORBA_WSTRINGSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
-  // class CORBA_WStringSeq_var
+  // class CORBA::WStringSeq_var
   // *************************************************************
-
-  class TAO_Export CORBA_WStringSeq_var
+  
+  class TAO_Export WStringSeq_var
   {
   public:
-    CORBA_WStringSeq_var (void); // default constructor
-    CORBA_WStringSeq_var (CORBA_WStringSeq *);
-    CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
-    ~CORBA_WStringSeq_var (void); // destructor
+    WStringSeq_var (void);
+    WStringSeq_var (WStringSeq *);
+    WStringSeq_var (const WStringSeq_var &);
+    ~WStringSeq_var (void);
     
-    CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
-    CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
-    CORBA_WStringSeq *operator-> (void);
-    const CORBA_WStringSeq *operator-> (void) const;
+    WStringSeq_var &operator= (WStringSeq *);
+    WStringSeq_var &operator= (const WStringSeq_var &);
+    WStringSeq *operator-> (void);
+    const WStringSeq *operator-> (void) const;
     
-    operator const CORBA_WStringSeq &() const;
-    operator CORBA_WStringSeq &();
-    operator CORBA_WStringSeq &() const;
-    operator CORBA_WStringSeq *&(); // variable-size base types only
+    operator const WStringSeq &() const;
+    operator WStringSeq &();
+    operator WStringSeq &() const;
+    
+    // Variable-size base types only.
+    operator WStringSeq *&();
     
     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
     
     // in, inout, out, _retn 
-    const CORBA_WStringSeq &in (void) const;
-    CORBA_WStringSeq &inout (void);
-    CORBA_WStringSeq *&out (void);
-    CORBA_WStringSeq *_retn (void);
-    CORBA_WStringSeq *ptr (void) const;
-
+    const WStringSeq &in (void) const;
+    WStringSeq &inout (void);
+    WStringSeq *&out (void);
+    WStringSeq *_retn (void);
+    WStringSeq *ptr (void) const;
+  
   private:
-    CORBA_WStringSeq *ptr_;
+    WStringSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
 #define _CORBA_WSTRINGSEQ___OUT_CH_
-
-  class TAO_Export CORBA_WStringSeq_out
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export WStringSeq_out
   {
   public:
-    CORBA_WStringSeq_out (CORBA_WStringSeq *&);
-    CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
-    CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
-    CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
-    CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
-    operator CORBA_WStringSeq *&();
-    CORBA_WStringSeq *&ptr (void);
-    CORBA_WStringSeq *operator-> (void);
+    WStringSeq_out (WStringSeq *&);
+    WStringSeq_out (WStringSeq_var &);
+    WStringSeq_out (const WStringSeq_out &);
+    WStringSeq_out &operator= (const WStringSeq_out &);
+    WStringSeq_out &operator= (WStringSeq *);
+    operator WStringSeq *&();
+    WStringSeq *&ptr (void);
+    WStringSeq *operator-> (void);
     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-    
+  
   private:
-    CORBA_WStringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_WStringSeq_var &);
+    WStringSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const WStringSeq_var &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
-// Proxy Broker Factory function pointer declarations.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_StringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StringSeq *&);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_WStringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_WStringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_WStringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_WStringSeq *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
 #define _TAO_CDR_OP_CORBA_StringSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_StringSeq &
+    const CORBA::StringSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_StringSeq &
+    CORBA::StringSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
 #define _TAO_CDR_OP_CORBA_WStringSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_WStringSeq &
+    const CORBA::WStringSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_WStringSeq &
+    CORBA::WStringSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "StringSeqC.i"
@@ -328,3 +389,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index ea871fc4a05..66a4b0ae58d 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -23,45 +23,54 @@
 #if !defined (_CORBA_STRINGSEQ_CI_)
 #define _CORBA_STRINGSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::StringSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_StringSeq_var::CORBA_StringSeq_var (void) // default constructor
+CORBA::StringSeq_var::StringSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_StringSeq_var::CORBA_StringSeq_var (CORBA_StringSeq *p)
+CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_StringSeq_var::CORBA_StringSeq_var (const ::CORBA_StringSeq_var &p) // copy constructor
+CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_StringSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA_StringSeq_var::~CORBA_StringSeq_var (void) // destructor
+CORBA::StringSeq_var::~StringSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_StringSeq_var &
-CORBA_StringSeq_var::operator= (CORBA_StringSeq *p)
+ACE_INLINE
+CORBA::StringSeq_var &
+CORBA::StringSeq_var::operator= (StringSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA_StringSeq_var &
-CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
+ACE_INLINE
+::CORBA::StringSeq_var &
+CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
 {
   if (this != &p)
     {
@@ -72,12 +81,16 @@ CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
         }
       else
         {
-          CORBA_StringSeq *deep_copy =
-            new CORBA_StringSeq (*p.ptr_);
+          StringSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              StringSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA_StringSeq *tmp = deep_copy;
+              StringSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -88,97 +101,107 @@ CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA_StringSeq *
-CORBA_StringSeq_var::operator-> (void) const
+ACE_INLINE
+const ::CORBA::StringSeq *
+CORBA::StringSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_StringSeq *
-CORBA_StringSeq_var::operator-> (void)
+ACE_INLINE
+::CORBA::StringSeq *
+CORBA::StringSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_StringSeq_var::operator const ::CORBA_StringSeq &() const // cast
+ACE_INLINE
+CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_StringSeq_var::operator ::CORBA_StringSeq &() // cast 
+ACE_INLINE
+CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_StringSeq_var::operator ::CORBA_StringSeq &() const // cast 
+ACE_INLINE
+CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-CORBA_StringSeq_var::operator ::CORBA_StringSeq *&() // cast 
+CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_StringSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA::StringSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA_StringSeq &
-CORBA_StringSeq_var::in (void) const
+ACE_INLINE
+const ::CORBA::StringSeq &
+CORBA::StringSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_StringSeq &
-CORBA_StringSeq_var::inout (void)
+ACE_INLINE
+::CORBA::StringSeq &
+CORBA::StringSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA_StringSeq *&
-CORBA_StringSeq_var::out (void)
+ACE_INLINE
+::CORBA::StringSeq *&
+CORBA::StringSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_StringSeq *
-CORBA_StringSeq_var::_retn (void)
+ACE_INLINE
+::CORBA::StringSeq *
+CORBA::StringSeq_var::_retn (void)
 {
-  ::CORBA_StringSeq *tmp = this->ptr_;
+  ::CORBA::StringSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA_StringSeq *
-CORBA_StringSeq_var::ptr (void) const
+ACE_INLINE
+::CORBA::StringSeq *
+CORBA::StringSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class CORBA::StringSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq *&p)
+CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq_var &p) // constructor from _var
+CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -186,94 +209,106 @@ CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq_var &p) // constructor
 }
 
 ACE_INLINE
-CORBA_StringSeq_out::CORBA_StringSeq_out (const ::CORBA_StringSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_StringSeq_out&, p).ptr_)
+CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p)
+  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA_StringSeq_out &
-CORBA_StringSeq_out::operator= (const ::CORBA_StringSeq_out &p)
+ACE_INLINE
+::CORBA::StringSeq_out &
+CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_StringSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (StringSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA_StringSeq_out &
-CORBA_StringSeq_out::operator= (CORBA_StringSeq *p)
+ACE_INLINE
+::CORBA::StringSeq_out &
+CORBA::StringSeq_out::operator= (StringSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
-CORBA_StringSeq_out::operator ::CORBA_StringSeq *&() // cast
+ACE_INLINE
+CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_StringSeq *&
-CORBA_StringSeq_out::ptr (void) // ptr
+ACE_INLINE
+::CORBA::StringSeq *&
+CORBA::StringSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_StringSeq *
-CORBA_StringSeq_out::operator-> (void)
+ACE_INLINE
+::CORBA::StringSeq *
+CORBA::StringSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_StringSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA::StringSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_WSTRINGSEQ_CI_)
 #define _CORBA_WSTRINGSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::WStringSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_WStringSeq_var::CORBA_WStringSeq_var (void) // default constructor
+CORBA::WStringSeq_var::WStringSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_WStringSeq_var::CORBA_WStringSeq_var (CORBA_WStringSeq *p)
+CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_WStringSeq_var::CORBA_WStringSeq_var (const ::CORBA_WStringSeq_var &p) // copy constructor
+CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_WStringSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA_WStringSeq_var::~CORBA_WStringSeq_var (void) // destructor
+CORBA::WStringSeq_var::~WStringSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_WStringSeq_var &
-CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p)
+ACE_INLINE
+CORBA::WStringSeq_var &
+CORBA::WStringSeq_var::operator= (WStringSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA_WStringSeq_var &
-CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
+ACE_INLINE
+::CORBA::WStringSeq_var &
+CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
 {
   if (this != &p)
     {
@@ -284,12 +319,16 @@ CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
         }
       else
         {
-          CORBA_WStringSeq *deep_copy =
-            new CORBA_WStringSeq (*p.ptr_);
+          WStringSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              WStringSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA_WStringSeq *tmp = deep_copy;
+              WStringSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -300,97 +339,107 @@ CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA_WStringSeq *
-CORBA_WStringSeq_var::operator-> (void) const
+ACE_INLINE
+const ::CORBA::WStringSeq *
+CORBA::WStringSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_WStringSeq *
-CORBA_WStringSeq_var::operator-> (void)
+ACE_INLINE
+::CORBA::WStringSeq *
+CORBA::WStringSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_WStringSeq_var::operator const ::CORBA_WStringSeq &() const // cast
+ACE_INLINE
+CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() // cast 
+ACE_INLINE
+CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() const // cast 
+ACE_INLINE
+CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-CORBA_WStringSeq_var::operator ::CORBA_WStringSeq *&() // cast 
+CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_WString_Manager
-CORBA_WStringSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE
+TAO_SeqElem_WString_Manager
+CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA_WStringSeq &
-CORBA_WStringSeq_var::in (void) const
+ACE_INLINE
+const ::CORBA::WStringSeq &
+CORBA::WStringSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_WStringSeq &
-CORBA_WStringSeq_var::inout (void)
+ACE_INLINE
+::CORBA::WStringSeq &
+CORBA::WStringSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA_WStringSeq *&
-CORBA_WStringSeq_var::out (void)
+ACE_INLINE
+::CORBA::WStringSeq *&
+CORBA::WStringSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_WStringSeq *
-CORBA_WStringSeq_var::_retn (void)
+ACE_INLINE
+::CORBA::WStringSeq *
+CORBA::WStringSeq_var::_retn (void)
 {
-  ::CORBA_WStringSeq *tmp = this->ptr_;
+  ::CORBA::WStringSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA_WStringSeq *
-CORBA_WStringSeq_var::ptr (void) const
+ACE_INLINE
+::CORBA::WStringSeq *
+CORBA::WStringSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class CORBA::WStringSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq *&p)
+CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq_var &p) // constructor from _var
+CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -398,51 +447,57 @@ CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq_var &p) // construc
 }
 
 ACE_INLINE
-CORBA_WStringSeq_out::CORBA_WStringSeq_out (const ::CORBA_WStringSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_)
+CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p)
+  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA_WStringSeq_out &
-CORBA_WStringSeq_out::operator= (const ::CORBA_WStringSeq_out &p)
+ACE_INLINE
+::CORBA::WStringSeq_out &
+CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (WStringSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA_WStringSeq_out &
-CORBA_WStringSeq_out::operator= (CORBA_WStringSeq *p)
+ACE_INLINE
+::CORBA::WStringSeq_out &
+CORBA::WStringSeq_out::operator= (WStringSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
-CORBA_WStringSeq_out::operator ::CORBA_WStringSeq *&() // cast
+ACE_INLINE
+CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_WStringSeq *&
-CORBA_WStringSeq_out::ptr (void) // ptr
+ACE_INLINE
+::CORBA::WStringSeq *&
+CORBA::WStringSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_WStringSeq *
-CORBA_WStringSeq_out::operator-> (void)
+ACE_INLINE
+::CORBA::WStringSeq *
+CORBA::WStringSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_WString_Manager
-CORBA_WStringSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE
+TAO_SeqElem_WString_Manager
+CORBA::WStringSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_I_
 #define _TAO_CDR_OP_CORBA_StringSeq_I_
@@ -451,6 +506,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::StringSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::StringSeq &
@@ -458,17 +514,20 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_I_
 #define _TAO_CDR_OP_CORBA_WStringSeq_I_
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA_WStringSeq &
+    const CORBA::WStringSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
-    CORBA_WStringSeq &
+    CORBA::WStringSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index e163e7a26bd..e3022f7bfdb 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *       -o orig -Gp -Gd -Ge 1
  *       -Wb,export_macro=TAO_Export
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 91fb8546c6a..eb33ebc6295 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -86,7 +86,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
                                       CORBA::ULong request_id,
                                       CORBA::Boolean response_expected,
                                       CORBA::Boolean deferred_reply,
-                                      TAO_ObjectKey &object_key,
+                                      TAO::ObjectKey &object_key,
                                       const char *operation,
                                       TAO_OutputCDR &output,
                                       TAO_Transport *transport,
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index daa44db3527..a01052131ad 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -79,7 +79,7 @@ public:
                      CORBA::ULong request_id,
                      CORBA::Boolean response_expected,
                      CORBA::Boolean deferred_flag,
-                     TAO_ObjectKey &object_key,
+                     TAO::ObjectKey &object_key,
                      const char *operation,
                      TAO_OutputCDR &output,
                      TAO_Transport *transport,
@@ -140,7 +140,7 @@ public:
 
   // CORBA::Principal_ptr principal (void) const;
 
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /**
    * @todo This two methods should go away.
@@ -273,7 +273,7 @@ private:
   TAO_Tagged_Profile profile_;
 
   /// Identifies the requester.
-  CORBA_OctetSeq_var requesting_principal_;
+  CORBA::OctetSeq_var requesting_principal_;
 
   /// Did we get passed to a CORBA::ServerRequest?
   CORBA::Boolean is_dsi_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 2f68925135c..e955f3197a1 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -79,7 +79,7 @@ return this->requesting_principal_.ptr ();
 }
 */
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_ServerRequest::object_key (void)
 {
   return this->profile_.object_key ();
@@ -128,7 +128,7 @@ TAO_ServerRequest::request_id (CORBA::ULong req)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::requesting_principal (const CORBA_OctetSeq &principal)
+TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal)
 {
   this->requesting_principal_ = principal;
 }
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index 23bd56f272c..2e7d8bfc7a4 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -44,13 +44,13 @@ public:
   CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr);
 
   /// Return the object key
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /// Save the object key
-  void object_key (TAO_ObjectKey &object_key);
+  void object_key (TAO::ObjectKey &object_key);
 
   /// Return a const object key
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// get the tagged_profile
   const IOP::TaggedProfile &tagged_profile (void) const;
@@ -92,7 +92,7 @@ private:
   CORBA::Boolean object_key_extracted_;
 
   /// The object key
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// The Tagged profile. This class would have the Tagged Profile
   IOP::TaggedProfile profile_;
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
index 2232b8a7d3d..c134318766e 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -14,7 +14,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
 }
 
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void)
 {
   if (this->object_key_extracted_ == 0)
@@ -24,7 +24,7 @@ TAO_Tagged_Profile::object_key (void)
 }
 
 ACE_INLINE void
-TAO_Tagged_Profile::object_key (TAO_ObjectKey &object_key)
+TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key)
 {
   this->object_key_.replace (object_key.length (),
                              object_key.length (),
@@ -32,7 +32,7 @@ TAO_Tagged_Profile::object_key (TAO_ObjectKey &object_key)
   this->object_key_extracted_ = 1;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void) const
 {
   return ACE_const_cast(TAO_Tagged_Profile *, this)->object_key ();
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index 8ac0c7dfb17..eba62cb9c6f 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -11,9 +11,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        TimeBase.pidl
@@ -99,6 +99,4 @@ module TimeBase
   };
 };
 
-#pragma prefix ""
-
 #endif /* TIME_BASE_PIDL */
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index dac0b617bad..fff9ea8f003 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -29,29 +29,32 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_TimeT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f54696d),
-  ACE_NTOHL (0x65543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f54696d), 
+  ACE_NTOHL (0x65543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-  6,
-  ACE_NTOHL (0x54696d65),
+    6,
+  ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x54000000),  // name = TimeT
-  CORBA::tk_ulonglong,
+    CORBA::tk_ulonglong,
 
 };
 
@@ -65,43 +68,50 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TimeT, &_tc_TAO_tc_TimeBase_TimeT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TimeT,
+    &_tc_TAO_tc_TimeBase_TimeT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e61),
-  ACE_NTOHL (0x63637572),
-  ACE_NTOHL (0x61637954),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e61), 
+  ACE_NTOHL (0x63637572), 
+  ACE_NTOHL (0x61637954), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-  12,
-  ACE_NTOHL (0x496e6163),
-  ACE_NTOHL (0x63757261),
+    12,
+  ACE_NTOHL (0x496e6163), 
+  ACE_NTOHL (0x63757261), 
   ACE_NTOHL (0x63795400),  // name = InaccuracyT
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
 };
@@ -116,25 +126,32 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InaccuracyT, &_tc_TAO_tc_TimeBase_InaccuracyT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InaccuracyT,
+    &_tc_TAO_tc_TimeBase_InaccuracyT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_TdfT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f546466),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f546466), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-  5,
-  ACE_NTOHL (0x54646654),
+    5,
+  ACE_NTOHL (0x54646654), 
   ACE_NTOHL (0x0),  // name = TdfT
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -148,74 +165,81 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TdfT, &_tc_TAO_tc_TimeBase_TdfT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TdfT,
+    &_tc_TAO_tc_TimeBase_TdfT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_UtcT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f557463),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f557463), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-  5,
-  ACE_NTOHL (0x55746354),
+    5,
+  ACE_NTOHL (0x55746354), 
   ACE_NTOHL (0x0),  // name = UtcT
   4, // member count
-  5,
-  ACE_NTOHL (0x74696d65),
+    5,
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x0),  // name = time
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x636c6f00),  // name = inacclo
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x63686900),  // name = inacchi
-  CORBA::tk_ushort,
+    CORBA::tk_ushort,
 
   4,
   ACE_NTOHL (0x74646600),  // name = tdf
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f546466),
-    ACE_NTOHL (0x543a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f546466), 
+    ACE_NTOHL (0x543a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-    5,
-    ACE_NTOHL (0x54646654),
+        5,
+    ACE_NTOHL (0x54646654), 
     ACE_NTOHL (0x0),  // name = TdfT
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
 };
@@ -230,77 +254,71 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UtcT, &_tc_TAO_tc_TimeBase_UtcT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_UtcT,
+    &_tc_TAO_tc_TimeBase_UtcT
+  )
 TAO_NAMESPACE_END
 
-void TimeBase::UtcT::_tao_any_destructor (void *x)
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UtcT *tmp = ACE_static_cast (UtcT*,x);
+  UtcT *tmp = ACE_static_cast (UtcT*, _tao_void_pointer);
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_IntervalT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e74),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6c543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e74), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6c543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-  10,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x7276616c),
+    10,
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x7276616c), 
   ACE_NTOHL (0x54000000),  // name = IntervalT
   2, // member count
-  12,
-  ACE_NTOHL (0x6c6f7765),
-  ACE_NTOHL (0x725f626f),
+    12,
+  ACE_NTOHL (0x6c6f7765), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = lower_bound
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
   12,
-  ACE_NTOHL (0x75707065),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x75707065), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = upper_bound
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-
+    0xffffffff, // indirection
+  0xffffffac, // negative offset (-84)
 };
 
 static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
@@ -313,178 +331,149 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IntervalT, &_tc_TAO_tc_TimeBase_IntervalT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IntervalT,
+    &_tc_TAO_tc_TimeBase_IntervalT
+  )
 TAO_NAMESPACE_END
 
-void TimeBase::IntervalT::_tao_any_destructor (void *x)
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer)
 {
-  IntervalT *tmp = ACE_static_cast (IntervalT*,x);
+  IntervalT *tmp = ACE_static_cast (IntervalT*, _tao_void_pointer);
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::UtcT &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TimeBase::UtcT &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert_copy (
+      _tao_any,
+      TimeBase::UtcT::_tao_any_destructor,
       TimeBase::_tc_UtcT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TimeBase::UtcT *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TimeBase::UtcT *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert (
+      _tao_any,
+      TimeBase::UtcT::_tao_any_destructor,
       TimeBase::_tc_UtcT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TimeBase::UtcT::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::UtcT *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TimeBase::UtcT *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const TimeBase::UtcT*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const TimeBase::UtcT *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::UtcT *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TimeBase::UtcT *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT 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 TimeBase::UtcT*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TimeBase::UtcT *tmp;
-      ACE_NEW_RETURN (tmp, TimeBase::UtcT, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TimeBase::_tc_UtcT,
-            1,
-            ACE_static_cast (void *, tmp),
-            TimeBase::UtcT::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<TimeBase::UtcT>::extract (
+        _tao_any,
+        TimeBase::UtcT::_tao_any_destructor,
+        TimeBase::_tc_UtcT,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::IntervalT &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TimeBase::UtcT>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::UtcT>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TimeBase::IntervalT &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert_copy (
+      _tao_any,
+      TimeBase::IntervalT::_tao_any_destructor,
       TimeBase::_tc_IntervalT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TimeBase::IntervalT *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TimeBase::IntervalT *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert (
+      _tao_any,
+      TimeBase::IntervalT::_tao_any_destructor,
       TimeBase::_tc_IntervalT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TimeBase::IntervalT::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::IntervalT *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TimeBase::IntervalT *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const TimeBase::IntervalT*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const TimeBase::IntervalT *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::IntervalT *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TimeBase::IntervalT *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT 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 TimeBase::IntervalT*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TimeBase::IntervalT *tmp;
-      ACE_NEW_RETURN (tmp, TimeBase::IntervalT, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TimeBase::_tc_IntervalT,
-            1,
-            ACE_static_cast (void *, tmp),
-            TimeBase::IntervalT::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::extract (
+        _tao_any,
+        TimeBase::IntervalT::_tao_any_destructor,
+        TimeBase::_tc_IntervalT,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TimeBase::IntervalT>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::IntervalT>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 8f93011521c..04632051f26 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -19,13 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -57,50 +59,80 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  TimeBase
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TimeT;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InaccuracyT;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TdfT;
-
-  struct UtcT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class UtcT_var;
   
   struct TAO_Export UtcT
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef UtcT_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (TimeBase, TimeT) time;
+    
+    static void _tao_any_destructor (void *);
+    TimeBase::TimeT time;
     CORBA::ULong inacclo;
     CORBA::UShort inacchi;
-    ACE_NESTED_CLASS (TimeBase, TdfT) tdf;
+    TimeBase::TdfT tdf;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export UtcT_var
   {
   public:
-    UtcT_var (void); // default constructor
+    UtcT_var (void);
     UtcT_var (UtcT *);
-    UtcT_var (const UtcT_var &); // copy constructor
-    UtcT_var (const UtcT &); // fixed-size types only
-    ~UtcT_var (void); // destructor
+    UtcT_var (const UtcT_var &);
+    // Fixed-size types only.
+    UtcT_var (const UtcT &);
+    ~UtcT_var (void);
     
     UtcT_var &operator= (UtcT *);
     UtcT_var &operator= (const UtcT_var &);
-    UtcT_var &operator= (const UtcT &); // fixed-size types only
+    
+    // Fixed-size types only.
+    UtcT_var &operator= (const UtcT &);
+    
     UtcT *operator-> (void);
     const UtcT *operator-> (void) const;
     
@@ -114,43 +146,54 @@ TAO_NAMESPACE  TimeBase
     UtcT &out (void);
     UtcT _retn (void);
     UtcT *ptr (void) const;
-
+  
   private:
     UtcT *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef UtcT &UtcT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UtcT;
-
-  struct IntervalT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class IntervalT_var;
   
   struct TAO_Export IntervalT
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IntervalT_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (TimeBase, TimeT) lower_bound;
-    ACE_NESTED_CLASS (TimeBase, TimeT) upper_bound;
+    
+    static void _tao_any_destructor (void *);
+    TimeBase::TimeT lower_bound;
+    TimeBase::TimeT upper_bound;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export IntervalT_var
   {
   public:
-    IntervalT_var (void); // default constructor
+    IntervalT_var (void);
     IntervalT_var (IntervalT *);
-    IntervalT_var (const IntervalT_var &); // copy constructor
-    IntervalT_var (const IntervalT &); // fixed-size types only
-    ~IntervalT_var (void); // destructor
+    IntervalT_var (const IntervalT_var &);
+    // Fixed-size types only.
+    IntervalT_var (const IntervalT &);
+    ~IntervalT_var (void);
     
     IntervalT_var &operator= (IntervalT *);
     IntervalT_var &operator= (const IntervalT_var &);
-    IntervalT_var &operator= (const IntervalT &); // fixed-size types only
+    
+    // Fixed-size types only.
+    IntervalT_var &operator= (const IntervalT &);
+    
     IntervalT *operator-> (void);
     const IntervalT *operator-> (void) const;
     
@@ -164,39 +207,67 @@ TAO_NAMESPACE  TimeBase
     IntervalT &out (void);
     IntervalT _retn (void);
     IntervalT *ptr (void) const;
-
+  
   private:
     IntervalT *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef IntervalT &IntervalT_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IntervalT;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TimeBase
 
-// Proxy Broker Factory function pointer declarations.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::UtcT &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
@@ -212,3 +283,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index 73ba4f4d77e..3db4462317f 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class TimeBase::UtcT_var
 // *************************************************************
 
 ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (void) // default constructor
+TimeBase::UtcT_var::UtcT_var (void)
   : ptr_ (0)
 {}
 
@@ -34,15 +38,19 @@ TimeBase::UtcT_var::UtcT_var (UtcT *p)
 {}
 
 ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p) // copy constructor
+TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p)
 {
@@ -50,33 +58,39 @@ TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p)
 }
 
 ACE_INLINE
-TimeBase::UtcT_var::~UtcT_var (void) // destructor
+TimeBase::UtcT_var::~UtcT_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (UtcT *p)
+ACE_INLINE
+TimeBase::UtcT_var &
+TimeBase::UtcT_var::operator= (UtcT *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_var &p)
+ACE_INLINE
+::TimeBase::UtcT_var &
+TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          UtcT *deep_copy =
-            new UtcT (*p.ptr_);
+          UtcT *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              UtcT (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -98,8 +112,13 @@ TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TimeBase::UtcT (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::TimeBase::UtcT (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -164,12 +183,15 @@ TimeBase::UtcT_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class TimeBase::IntervalT_var
 // *************************************************************
 
 ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (void) // default constructor
+TimeBase::IntervalT_var::IntervalT_var (void)
   : ptr_ (0)
 {}
 
@@ -179,15 +201,19 @@ TimeBase::IntervalT_var::IntervalT_var (IntervalT *p)
 {}
 
 ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p) // copy constructor
+TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p)
 {
@@ -195,33 +221,39 @@ TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p)
 }
 
 ACE_INLINE
-TimeBase::IntervalT_var::~IntervalT_var (void) // destructor
+TimeBase::IntervalT_var::~IntervalT_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (IntervalT *p)
+ACE_INLINE
+TimeBase::IntervalT_var &
+TimeBase::IntervalT_var::operator= (IntervalT *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_var &p)
+ACE_INLINE
+::TimeBase::IntervalT_var &
+TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          IntervalT *deep_copy =
-            new IntervalT (*p.ptr_);
+          IntervalT *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IntervalT (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -243,8 +275,13 @@ TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TimeBase::IntervalT (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::TimeBase::IntervalT (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -309,55 +346,89 @@ TimeBase::IntervalT_var::ptr (void) const
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::UtcT &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::UtcT &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.time) &&
     (strm << _tao_aggregate.inacclo) &&
     (strm << _tao_aggregate.inacchi) &&
     (strm << _tao_aggregate.tdf)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::UtcT &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::UtcT &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.time) &&
     (strm >> _tao_aggregate.inacclo) &&
     (strm >> _tao_aggregate.inacchi) &&
     (strm >> _tao_aggregate.tdf)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::IntervalT &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::IntervalT &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.lower_bound) &&
     (strm << _tao_aggregate.upper_bound)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::IntervalT &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::IntervalT &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.lower_bound) &&
     (strm >> _tao_aggregate.upper_bound)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 8069ee22e2f..886f026f634 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -83,7 +83,7 @@ public:
    * in the mprofile that is of the same type.  Currently, this
    * is used when RT CORBA is enabled.
    */
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority) = 0;
 
@@ -105,7 +105,7 @@ public:
    * encapsulation.
    */
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key) = 0;
+                          TAO::ObjectKey &key) = 0;
 
 private:
 
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index 0c6f36a6a26..c632de95513 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -10,9 +10,9 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        WrongTransaction.pidl
@@ -41,6 +41,4 @@ module CORBA
   exception WrongTransaction {};
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_WRONGTRANSACTION_PIDL */
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 0047bc59a12..60442b7ec8b 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "WrongTransactionC.h"
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -33,6 +37,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -41,7 +47,9 @@
 #include "WrongTransactionC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::WrongTransaction::WrongTransaction (void)
   : CORBA_UserException (
         "IDL:omg.org/CORBA/WrongTransaction:1.0",
@@ -50,12 +58,10 @@ CORBA::WrongTransaction::WrongTransaction (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::WrongTransaction::~WrongTransaction (void)
 {
 }
 
-// Copy constructor.
 CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp)
   : CORBA_UserException (
         _tao_excp._rep_id (),
@@ -64,7 +70,6 @@ CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao
 {
 }
 
-// Assignment operator.
 CORBA::WrongTransaction&
 CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
 {
@@ -79,11 +84,11 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::WrongTransaction *
-CORBA::WrongTransaction::_downcast (CORBA::Exception *exc)
+CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongTransaction *, exc);
+      return ACE_dynamic_cast (WrongTransaction *, _tao_excp);
     }
   else
     {
@@ -104,13 +109,13 @@ CORBA::WrongTransaction::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::WrongTransaction (*this),
+      ::CORBA::WrongTransaction (*this),
       0
     );
   return result;
 }
 
-void CORBA::WrongTransaction::_raise ()
+void CORBA::WrongTransaction::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -124,7 +129,7 @@ void CORBA::WrongTransaction::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -137,32 +142,41 @@ void CORBA::WrongTransaction::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
+{
+  return ::CORBA::_tc_WrongTransaction;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_WrongTransaction[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5772),
-  ACE_NTOHL (0x6f6e6754),
-  ACE_NTOHL (0x72616e73),
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5772), 
+  ACE_NTOHL (0x6f6e6754), 
+  ACE_NTOHL (0x72616e73), 
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
-  17,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67547261),
-  ACE_NTOHL (0x6e736163),
-  ACE_NTOHL (0x74696f6e),
+    17,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67547261), 
+  ACE_NTOHL (0x6e736163), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = WrongTransaction
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
     CORBA::tk_except,
@@ -174,104 +188,76 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_WrongTransaction, &_tc_TAO_tc_CORBA_WrongTransaction)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_WrongTransaction,
+    &_tc_TAO_tc_CORBA_WrongTransaction
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
-{
-  return ::CORBA::_tc_WrongTransaction;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::WrongTransaction &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::WrongTransaction &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy (
+      _tao_any,
+      CORBA::WrongTransaction::_tao_any_destructor,
       CORBA::_tc_WrongTransaction,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::WrongTransaction *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WrongTransaction *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert (
+      _tao_any,
+      CORBA::WrongTransaction::_tao_any_destructor,
       CORBA::_tc_WrongTransaction,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::WrongTransaction::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WrongTransaction *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WrongTransaction *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::WrongTransaction*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::WrongTransaction *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WrongTransaction *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::WrongTransaction *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_WrongTransaction ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::WrongTransaction *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::WrongTransaction *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::WrongTransaction, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/WrongTransaction:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_WrongTransaction,
-            1,
-            tmp,
-            CORBA::WrongTransaction::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract (
+        _tao_any,
+        CORBA::WrongTransaction::_tao_any_destructor,
+        CORBA::_tc_WrongTransaction,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index a29869dc5f8..f9cdb311050 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 
@@ -59,24 +62,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_WRONGTRANSACTION_CH_)
 #define _CORBA_WRONGTRANSACTION_CH_
-
+  
   class TAO_Export WrongTransaction : public CORBA::UserException
   {
   public:
-
+    
     WrongTransaction (void);
     WrongTransaction (const WrongTransaction &);
     ~WrongTransaction (void);
 
     WrongTransaction &operator= (const WrongTransaction &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static WrongTransaction *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -88,38 +97,57 @@ TAO_NAMESPACE  CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction;
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "WrongTransactionC.i"
@@ -137,3 +165,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &)
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i
index 84fd54d23eb..bc6631d62a3 100644
--- a/TAO/tao/WrongTransactionC.i
+++ b/TAO/tao/WrongTransactionC.i
@@ -19,20 +19,33 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception CORBA::WrongTransaction
-// *************************************************************
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::WrongTransaction &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::WrongTransaction &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,CORBA::WrongTransaction&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::WrongTransaction&
+  )
 {
   return 1;
 }
+
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 509a103f4b5..f1499ac4819 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -309,6 +309,12 @@ enum TAO_SERVANT_LOCATION
   TAO_SERVANT_NOT_FOUND
 };
 
+TAO_NAMESPACE  TAO
+{
+  class ObjectKey;
+}
+TAO_NAMESPACE_CLOSE  // end of class (namespace) TAO
+
 TAO_NAMESPACE CORBA
 {
   // = TITLE
@@ -385,27 +391,6 @@ TAO_NAMESPACE CORBA
   typedef CORBA_WString_var WString_var;
   typedef CORBA_WString_out WString_out;
 
-  /// String sequence typedefs
-  typedef CORBA_StringSeq StringSeq;
-  typedef CORBA_StringSeq_var StringSeq_var;
-  typedef CORBA_StringSeq_out StringSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_StringSeq;
-
-  typedef CORBA_WStringSeq WStringSeq;
-  typedef CORBA_WStringSeq_var WStringSeq_var;
-  typedef CORBA_WStringSeq_out WStringSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_WStringSeq;
-
-  /// Octet sequence typedef
-  typedef CORBA_OctetSeq OctetSeq;
-  typedef CORBA_OctetSeq_var OctetSeq_var;
-  typedef CORBA_OctetSeq_out OctetSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_OctetSeq;
-
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_var;
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_out;
-
   // = various CORBA defined classes.
 
   class Any;
@@ -476,14 +461,8 @@ TAO_NAMESPACE CORBA
 
   typedef CORBA_ImplementationDef *ImplementationDef_ptr;
 
-  typedef CORBA_Current Current;
-  typedef CORBA_Current *Current_ptr;
-  typedef CORBA_Current_var Current_var;
-  typedef CORBA_Current_out Current_out;
-
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-//  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
   typedef CORBA_ValueBase ValueBase;
   typedef CORBA_ValueBase *ValueBase_ptr;
@@ -1024,10 +1003,6 @@ operator<< (TAO_OutputCDR &, const CORBA::TCKind &);
 TAO_Export CORBA::Boolean
 operator>> (TAO_InputCDR &, CORBA::TCKind &);
 
-class TAO_ObjectKey;
-class TAO_ObjectKey_var;
-class TAO_ObjectKey_out;
-
 #if defined (__ACE_INLINE__)
 # include "tao/corbafwd.i"
 #endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 488511a0ca8..4c9f8d552aa 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -81,7 +81,7 @@ public:
   // stack. These methods does not make a copy but holds the pointer
   // passed in.
   /// Set the target specification by giving the object key.
-  void target_specifier (const TAO_ObjectKey &key);
+  void target_specifier (const TAO::ObjectKey &key);
 
 
   /// Set the target specification by passing in an IOP::TaggedProfile.
@@ -101,7 +101,7 @@ public:
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const TAO_ObjectKey* object_key (void);
+  const TAO::ObjectKey* object_key (void);
 
   /**
    * Returns the IOP::TaggedProfile after a check of the stored specifier. If
@@ -124,7 +124,7 @@ public:
 private:
   union
   {
-    TAO_ObjectKey *object_key_;
+    TAO::ObjectKey *object_key_;
     IOP::TaggedProfile *profile_;
     IOP::IOR *ior_;
   } u_;
diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i
index 17b942b85c3..75fd8e7af24 100644
--- a/TAO/tao/target_specification.i
+++ b/TAO/tao/target_specification.i
@@ -11,7 +11,7 @@ TAO_Target_Specification::TAO_Target_Specification (void)
 }
 
 ACE_INLINE void
-TAO_Target_Specification::target_specifier (const TAO_ObjectKey &key)
+TAO_Target_Specification::target_specifier (const TAO::ObjectKey &key)
 {
   this->specifier_ = TAO_Target_Specification::Key_Addr;
   // @@ Bala: this is a good recipe for a crash, if the <key> was on
@@ -23,7 +23,7 @@ TAO_Target_Specification::target_specifier (const TAO_ObjectKey &key)
   // general is better....  but you are probably right in this case, i
   // suspect this stuff goes right in the critical path, right? So
   // making a copy of the object key would be too expensive..
-  this->u_.object_key_ = ACE_const_cast (TAO_ObjectKey *,
+  this->u_.object_key_ = ACE_const_cast (TAO::ObjectKey *,
                                          &key);
 }
 
@@ -48,7 +48,7 @@ TAO_Target_Specification::target_specifier (IOP::IOR &ior,
       
 }
 
-ACE_INLINE const TAO_ObjectKey*
+ACE_INLINE const TAO::ObjectKey*
 TAO_Target_Specification::object_key (void)
 {
   if (this->specifier_ == TAO_Target_Specification::Key_Addr)
author	parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-01-10 01:01:15 +0000
committer	parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-01-10 01:01:15 +0000
commit	6a05720b40f11fc4beae88d68e578ca2477b347a (patch)
tree	02ad6881de0dad301615f5dabf1fbf666a045561
parent	4900ff32cde5c498fd71546a9bb59e1e336a99b8 (diff)
download	ATCD-6a05720b40f11fc4beae88d68e578ca2477b347a.tar.gz