ChangeLogTag: Wed Mar 12 09:49:00 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 1744 insertions, 1075 deletions

diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl
index f9084893267..4a85c3af119 100644
--- a/TAO/tao/IORManipulation/IOR.pidl
+++ b/TAO/tao/IORManipulation/IOR.pidl
@@ -10,12 +10,12 @@
  * To regenerate the code use:
  *
  * tao_idl \
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \
+ *        -o orig -Gp -Gd -Ge 1 \
  *          -Wb,export_macro=TAO_IORManip_Export \
  *          -Wb,export_include="ior_manip_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
- *   IOR.idl
+ *   IOR.pidl
  *
  */
 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index c2f7ab84f80..c0425d312ce 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IORManip_Loader.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "IORManipulation.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,7 +44,9 @@
 #include "IORC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/EmptyProfileList:1.0",
@@ -48,12 +55,10 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -62,7 +67,6 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &
 {
 }
 
-// Assignment operator.
 TAO_IOP::EmptyProfileList&
 TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
 {
@@ -77,11 +81,11 @@ void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::EmptyProfileList *
-TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc)
+TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (EmptyProfileList *, exc);
+      return ACE_dynamic_cast (EmptyProfileList *, _tao_excp);
     }
   else
     {
@@ -102,13 +106,13 @@ TAO_IOP::EmptyProfileList::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::EmptyProfileList (*this),
+      ::TAO_IOP::EmptyProfileList (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::EmptyProfileList::_raise ()
+void TAO_IOP::EmptyProfileList::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -122,7 +126,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -135,31 +139,40 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_EmptyProfileList;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
-  17,
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
+    17,
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
     CORBA::tk_except,
@@ -171,17 +184,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_EmptyProfileList,
+    &_tc_TAO_tc_TAO_IOP_EmptyProfileList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
-{
-  return ::TAO_IOP::_tc_EmptyProfileList;
-}
-
-// Default constructor.
 TAO_IOP::NotFound::NotFound (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/NotFound:1.0",
@@ -190,12 +202,10 @@ TAO_IOP::NotFound::NotFound (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::NotFound::~NotFound (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -204,7 +214,6 @@ TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::NotFound&
 TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 {
@@ -219,11 +228,11 @@ void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::NotFound *
-TAO_IOP::NotFound::_downcast (CORBA::Exception *exc)
+TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotFound *, exc);
+      return ACE_dynamic_cast (NotFound *, _tao_excp);
     }
   else
     {
@@ -244,13 +253,13 @@ TAO_IOP::NotFound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::NotFound (*this),
+      ::TAO_IOP::NotFound (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::NotFound::_raise ()
+void TAO_IOP::NotFound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -264,7 +273,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -277,27 +286,36 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
+{
+  return ::TAO_IOP::_tc_NotFound;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   25,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
-  9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+    9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
     CORBA::tk_except,
@@ -309,17 +327,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NotFound,
+    &_tc_TAO_tc_TAO_IOP_NotFound
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
-{
-  return ::TAO_IOP::_tc_NotFound;
-}
-
-// Default constructor.
 TAO_IOP::Duplicate::Duplicate (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/Duplicate:1.0",
@@ -328,12 +345,10 @@ TAO_IOP::Duplicate::Duplicate (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::Duplicate::~Duplicate (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -342,7 +357,6 @@ TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::Duplicate&
 TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 {
@@ -357,11 +371,11 @@ void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::Duplicate *
-TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc)
+TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Duplicate *, exc);
+      return ACE_dynamic_cast (Duplicate *, _tao_excp);
     }
   else
     {
@@ -382,13 +396,13 @@ TAO_IOP::Duplicate::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::Duplicate (*this),
+      ::TAO_IOP::Duplicate (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::Duplicate::_raise ()
+void TAO_IOP::Duplicate::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -402,7 +416,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -415,27 +429,36 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
+{
+  return ::TAO_IOP::_tc_Duplicate;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
-  10,
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
+    10,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
   ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
     CORBA::tk_except,
@@ -447,17 +470,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Duplicate,
+    &_tc_TAO_tc_TAO_IOP_Duplicate
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
-{
-  return ::TAO_IOP::_tc_Duplicate;
-}
-
-// Default constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/Invalid_IOR:1.0",
@@ -466,12 +488,10 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -480,7 +500,6 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::Invalid_IOR&
 TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
@@ -495,11 +514,11 @@ void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::Invalid_IOR *
-TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc)
+TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Invalid_IOR *, exc);
+      return ACE_dynamic_cast (Invalid_IOR *, _tao_excp);
     }
   else
     {
@@ -520,13 +539,13 @@ TAO_IOP::Invalid_IOR::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::Invalid_IOR (*this),
+      ::TAO_IOP::Invalid_IOR (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::Invalid_IOR::_raise ()
+void TAO_IOP::Invalid_IOR::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -540,7 +559,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -553,27 +572,36 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
+{
+  return ::TAO_IOP::_tc_Invalid_IOR;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
-  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f523a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
-  12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
   ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
     CORBA::tk_except,
@@ -585,17 +613,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Invalid_IOR,
+    &_tc_TAO_tc_TAO_IOP_Invalid_IOR
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
-{
-  return ::TAO_IOP::_tc_Invalid_IOR;
-}
-
-// Default constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/MultiProfileList:1.0",
@@ -604,12 +631,10 @@ TAO_IOP::MultiProfileList::MultiProfileList (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::MultiProfileList::~MultiProfileList (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -618,7 +643,6 @@ TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &
 {
 }
 
-// Assignment operator.
 TAO_IOP::MultiProfileList&
 TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
 {
@@ -633,11 +657,11 @@ void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::MultiProfileList *
-TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc)
+TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (MultiProfileList *, exc);
+      return ACE_dynamic_cast (MultiProfileList *, _tao_excp);
     }
   else
     {
@@ -658,13 +682,13 @@ TAO_IOP::MultiProfileList::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::MultiProfileList (*this),
+      ::TAO_IOP::MultiProfileList (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::MultiProfileList::_raise ()
+void TAO_IOP::MultiProfileList::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -678,7 +702,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -691,31 +715,40 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_MultiProfileList;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
-  17,
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
+    17,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
     CORBA::tk_except,
@@ -727,15 +760,15 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_MultiProfileList,
+    &_tc_TAO_tc_TAO_IOP_MultiProfileList
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
-{
-  return ::TAO_IOP::_tc_MultiProfileList;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int TAO_IOP::TAO_IOR_Property::_tao_class_id = 0;
 
@@ -782,13 +815,23 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_IOP_TAO_IOR_Property_marshal (
+    TAO_IOP::TAO_IOR_Property_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Property_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void)
   : ptr_ (TAO_IOR_Property::_nil ())
 {}
 
@@ -798,12 +841,12 @@ TAO_IOP::TAO_IOR_Property_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p)
   : TAO_Base_var (),
     ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
 {}
 
-TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void) // destructor
+TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -832,7 +875,7 @@ TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &(
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
+TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -907,10 +950,11 @@ TAO_IOP::TAO_IOR_Property_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Property_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
@@ -919,14 +963,14 @@ TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p)
   : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
 {}
 
@@ -957,7 +1001,7 @@ TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // c
 }
 
 ::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_out::ptr (void) // ptr
+TAO_IOP::TAO_IOR_Property_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -968,9 +1012,8 @@ TAO_IOP::TAO_IOR_Property_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
 
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
@@ -978,7 +1021,15 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
+void 
+TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_IOR_Property *tmp = ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -986,50 +1037,68 @@ TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
   return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_ptr 
 TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return TAO_IOR_Property::_nil ();
+    {
+      return TAO_IOR_Property::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           TAO_IOR_Property_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &TAO_IOR_Property::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &TAO_IOR_Property::_tao_class_id
+                )
+            )
         );
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_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 (::TAO_IOP, TAO_IOR_Property)::_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;
 }
 
@@ -1038,6 +1107,50 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Property: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_TAO_IOP_TAO_IOR_Property[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727479), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Property:1.0
+    17,
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727479), 
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Property
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Property (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Property),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Property,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Property)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO_IOP)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TAO_IOR_Property,
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Property
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int TAO_IOP::TAO_IOR_Manipulation::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -1083,13 +1196,23 @@ tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_IOP_TAO_IOR_Manipulation_marshal (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void)
   : ptr_ (TAO_IOR_Manipulation::_nil ())
 {}
 
@@ -1099,12 +1222,12 @@ TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
   : TAO_Base_var (),
     ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
 {}
 
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
+TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1133,7 +1256,7 @@ TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulatio
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
+TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1208,10 +1331,11 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
@@ -1220,14 +1344,14 @@ TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulatio
   this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
   : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
 {}
 
@@ -1258,7 +1382,7 @@ TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr
 }
 
 ::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
+TAO_IOP::TAO_IOR_Manipulation_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1269,9 +1393,8 @@ TAO_IOP::TAO_IOR_Manipulation_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
 
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 {}
@@ -1279,7 +1402,15 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
+void 
+TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_IOR_Manipulation *tmp = ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1287,50 +1418,68 @@ TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
   return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_ptr 
 TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return TAO_IOR_Manipulation::_nil ();
+    {
+      return TAO_IOR_Manipulation::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           TAO_IOR_Manipulation_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &TAO_IOR_Manipulation::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &TAO_IOR_Manipulation::_tao_class_id
+                )
+            )
         );
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_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 (::TAO_IOP, TAO_IOR_Manipulation)::_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;
 }
 
@@ -1339,6 +1488,8 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
 
+// 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)
 
@@ -1351,27 +1502,29 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 {
   CORBA::Object **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = CORBA::Object::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::Object::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1379,15 +1532,18 @@ void
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = CORBA::Object::_nil ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -1401,7 +1557,7 @@ void
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -1409,7 +1565,7 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
     }
 }
 
-void
+void 
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
     void* target,
     CORBA::Object *src
@@ -1430,516 +1586,634 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation::IORList
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Object_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
 {}
+
 void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_void_pointer)
 {
   IORList *tmp = ACE_static_cast (IORList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList &_tao_elem) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
+    8,
+  ACE_NTOHL (0x494f524c), 
+  ACE_NTOHL (0x69737400),  // name = IORList
+    CORBA::tk_sequence, // typecode kind
+  60, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+        0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList)
+  );
+
+::CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
+  &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
+    21,
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Manipulation)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO_IOP)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TAO_IOR_Manipulation,
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation
+  )
+TAO_NAMESPACE_END
+
+// 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 TAO_IOP::EmptyProfileList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
       TAO_IOP::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
       TAO_IOP::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::EmptyProfileList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::EmptyProfileList*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::EmptyProfileList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::EmptyProfileList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::extract (
+        _tao_any,
+        TAO_IOP::EmptyProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_EmptyProfileList,
+        _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<TAO_IOP::EmptyProfileList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::EmptyProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::EmptyProfileList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::EmptyProfileList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/EmptyProfileList:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_EmptyProfileList,
-            1,
-            tmp,
-            TAO_IOP::EmptyProfileList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// 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 TAO_IOP::NotFound &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert_copy (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
       TAO_IOP::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::NotFound *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
       TAO_IOP::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::NotFound::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::NotFound *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::NotFound*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::NotFound *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::extract (
+        _tao_any,
+        TAO_IOP::NotFound::_tao_any_destructor,
+        TAO_IOP::_tc_NotFound,
+        _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<TAO_IOP::NotFound>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::NotFound *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::NotFound, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/NotFound:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_NotFound,
-            1,
-            tmp,
-            TAO_IOP::NotFound::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// 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 TAO_IOP::Duplicate &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert_copy (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
       TAO_IOP::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Duplicate *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
       TAO_IOP::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::Duplicate::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Duplicate *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::Duplicate*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Duplicate *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::extract (
+        _tao_any,
+        TAO_IOP::Duplicate::_tao_any_destructor,
+        TAO_IOP::_tc_Duplicate,
+        _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<TAO_IOP::Duplicate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::Duplicate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::Duplicate *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::Duplicate, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/Duplicate:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_Duplicate,
-            1,
-            tmp,
-            TAO_IOP::Duplicate::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// 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 TAO_IOP::Invalid_IOR &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert_copy (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
       TAO_IOP::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
       TAO_IOP::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::Invalid_IOR::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::Invalid_IOR*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Invalid_IOR *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_IOR *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::extract (
+        _tao_any,
+        TAO_IOP::Invalid_IOR::_tao_any_destructor,
+        TAO_IOP::_tc_Invalid_IOR,
+        _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<TAO_IOP::Invalid_IOR>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::Invalid_IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::Invalid_IOR *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::Invalid_IOR, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/Invalid_IOR:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_Invalid_IOR,
-            1,
-            tmp,
-            TAO_IOP::Invalid_IOR::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// 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 TAO_IOP::MultiProfileList &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
       TAO_IOP::_tc_MultiProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
       TAO_IOP::_tc_MultiProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::MultiProfileList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::MultiProfileList*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::MultiProfileList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProfileList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::extract (
+        _tao_any,
+        TAO_IOP::MultiProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_MultiProfileList,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList 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<TAO_IOP::MultiProfileList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>
+#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 = (TAO_IOP::MultiProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::MultiProfileList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::MultiProfileList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/MultiProfileList:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_MultiProfileList,
-            1,
-            tmp,
-            TAO_IOP::MultiProfileList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Property_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Property::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Property,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Property,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>
+  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>;
+  template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property, TAO_IOP::TAO_IOR_Property_var>
+# pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>
 #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,
+    TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Manipulation,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Manipulation,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
+  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
+  template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation, TAO_IOP::TAO_IOR_Manipulation_var>
+# pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>
 #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<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::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<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index b5b968cd499..043caad1511 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.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_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
 
@@ -61,24 +64,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  TAO_IOP
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
   {
   public:
-
+    
     EmptyProfileList (void);
     EmptyProfileList (const EmptyProfileList &);
     ~EmptyProfileList (void);
 
     EmptyProfileList &operator= (const EmptyProfileList &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -90,37 +99,43 @@ TAO_NAMESPACE  TAO_IOP
         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_EmptyProfileList;
-
+  
+  // 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_EmptyProfileList;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
-
+  
   class TAO_IORManip_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -132,37 +147,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
         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_NotFound;
-
+  
+  // 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_NotFound;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
-
+  
   class TAO_IORManip_Export Duplicate : public CORBA::UserException
   {
   public:
-
+    
     Duplicate (void);
     Duplicate (const Duplicate &);
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -174,37 +195,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         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_Duplicate;
-
+  
+  // 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_Duplicate;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-
+  
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-
+    
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -216,37 +243,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
         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_Invalid_IOR;
-
+  
+  // 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_Invalid_IOR;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-
+    
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -258,55 +291,63 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
         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_MultiProfileList;
-
+  
+  // 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_MultiProfileList;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_
-
+  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORManip_Export TAO_IOR_Property_var : public TAO_Base_var
   {
   public:
     TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {}
+    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
     TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
     ~TAO_IOR_Property_var (void); // destructor
-
+    
     TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
     TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
     TAO_IOR_Property_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Property_ptr &() const;
     operator TAO_IOR_Property_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Property_ptr in (void) const;
     TAO_IOR_Property_ptr &inout (void);
     TAO_IOR_Property_ptr &out (void);
     TAO_IOR_Property_ptr _retn (void);
     TAO_IOR_Property_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr);
@@ -317,7 +358,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TAO_IOR_Property_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -325,13 +366,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     TAO_IOR_Property_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORManip_Export TAO_IOR_Property_out
   {
   public:
@@ -344,47 +386,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     operator TAO_IOR_Property_ptr &();
     TAO_IOR_Property_ptr &ptr (void);
     TAO_IOR_Property_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Property_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 (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-
+    
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _nil (void)
       {
         return (TAO_IOR_Property_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::Boolean set_property (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -393,7 +438,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -404,7 +452,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -413,7 +464,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -421,58 +475,73 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       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:
     TAO_IOR_Property (void);
-
     virtual ~TAO_IOR_Property (void);
-
+    
+    friend class _TAO_TAO_IOR_Property_Remote_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Property_ThruPOA_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Property_Direct_Proxy_Impl;
+  
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
     void operator= (const TAO_IOR_Property &);
   };
 
-
 #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_TAO_IOR_Property;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-
+  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
+    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
     TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
     ~TAO_IOR_Manipulation_var (void); // destructor
-
+    
     TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
     TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
     TAO_IOR_Manipulation_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Manipulation_ptr &() const;
     operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Manipulation_ptr in (void) const;
     TAO_IOR_Manipulation_ptr &inout (void);
     TAO_IOR_Manipulation_ptr &out (void);
     TAO_IOR_Manipulation_ptr _retn (void);
     TAO_IOR_Manipulation_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr);
@@ -483,7 +552,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TAO_IOR_Manipulation_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -491,13 +560,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation_out
   {
   public:
@@ -510,58 +580,59 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     operator TAO_IOR_Manipulation_ptr &();
     TAO_IOR_Manipulation_ptr &ptr (void);
     TAO_IOR_Manipulation_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Manipulation_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 (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-
+    
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _nil (void)
       {
         return (TAO_IOR_Manipulation_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // 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_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
-    class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
+    
+    class TAO_IORManip_Export _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
       : public TAO_Unbounded_Base_Sequence
     {
     public:
-      // = Initialization and termination methods.
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
@@ -577,14 +648,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
           const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
         );
       virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-
+      
       // = Accessors.
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
-
+      
       // = Static operations.
       static CORBA::Object **allocbuf (CORBA::ULong nelems);
       static void freebuf (CORBA::Object **buffer);
-
+      
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -594,7 +665,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
           CORBA::ULong nl,
           CORBA::ULong ol
         );
-
+      
       virtual void _downcast (
           void* target,
           CORBA::Object *src
@@ -605,56 +676,62 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class IORList;
     class IORList_var;
-
+    
     // *************************************************************
-    // IORList
+    // TAO_IOP::TAO_IOR_Manipulation::IORList
     // *************************************************************
+    
+    class TAO_IORManip_Export IORList : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-    class TAO_IORManip_Export IORList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      IORList (void); // default ctor
-      IORList (CORBA::ULong max); // uses max size
+      IORList (void);
+      IORList (CORBA::ULong max);
       IORList (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Object_ptr *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::Object_ptr *buffer, 
           CORBA::Boolean release = 0
         );
-      IORList (const IORList &); // copy ctor
+      IORList (const IORList &);
       ~IORList (void);
+      
       static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      
       typedef IORList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
     };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
     // *************************************************************
     // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
     // *************************************************************
-
+    
     class TAO_IORManip_Export IORList_var
     {
     public:
@@ -662,37 +739,40 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       IORList_var (IORList *);
       IORList_var (const IORList_var &);
       ~IORList_var (void);
-
+      
       IORList_var &operator= (IORList *);
       IORList_var &operator= (const IORList_var &);
       IORList *operator-> (void);
       const IORList *operator-> (void) const;
-
+      
       operator const IORList &() const;
       operator IORList &();
       operator IORList &() const;
-      operator IORList *&(); // variable-size base types only
-
+      
+      // Variable-size base types only.
+      operator IORList *&();
+      
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const IORList &in (void) const;
       IORList &inout (void);
       IORList *&out (void);
       IORList *_retn (void);
       IORList *ptr (void) const;
-
+    
     private:
       IORList *ptr_;
     };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
     class TAO_IORManip_Export IORList_out
     {
     public:
@@ -705,16 +785,23 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       IORList *&ptr (void);
       IORList *operator-> (void);
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
+    
     private:
       IORList *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const IORList_var &);
     };
 
-
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_IORList;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -725,7 +812,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -737,7 +827,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -749,7 +842,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::EmptyProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -760,7 +856,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Invalid_IOR
         , TAO_IOP::Duplicate
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
@@ -774,7 +873,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::MultiProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -784,7 +886,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -793,7 +898,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       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::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -803,7 +911,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -812,69 +923,145 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::EmptyProfileList
       )) = 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:
     TAO_IOR_Manipulation (void);
-
     virtual ~TAO_IOR_Manipulation (void);
-
+    
+    friend class _TAO_TAO_IOR_Manipulation_Remote_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Manipulation_ThruPOA_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Manipulation_Direct_Proxy_Impl;
+  
   private:
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
     void operator= (const TAO_IOR_Manipulation &);
   };
 
-
 #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_TAO_IOR_Manipulation;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_IOP
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::EmptyProfileList &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::EmptyProfileList*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::EmptyProfileList *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::EmptyProfileList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::NotFound &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::NotFound*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::NotFound *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::NotFound *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Duplicate &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Duplicate*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Duplicate *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Duplicate *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Invalid_IOR &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Invalid_IOR*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Invalid_IOR *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Invalid_IOR *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::MultiProfileList &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::MultiProfileList*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::MultiProfileList *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::MultiProfileList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
+
+// 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_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::EmptyProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::EmptyProfileList &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::NotFound &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::NotFound &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Duplicate &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Duplicate &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Invalid_IOR &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Invalid_IOR &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::MultiProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
 
+// 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 "IORC.i"
@@ -890,3 +1077,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index a87fece232f..2ac7e82b0ad 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -19,40 +19,32 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception TAO_IOP::EmptyProfileList
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::NotFound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::Duplicate
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::Invalid_IOR
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::MultiProfileList
-// *************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #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_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
 
-ACE_INLINE CORBA::Object **
+ACE_INLINE
+CORBA::Object **
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::Object **buf = 0;
@@ -67,11 +59,15 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -87,64 +83,83 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Object* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Object* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(
+    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Object **tmp1 = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-    CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Object **tmp1 =
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
+      CORBA::Object ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (
+    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
+      CORBA::Object **tmp =
+        ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = CORBA::Object::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Object **tmp1 = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-  CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Object **tmp1 =
+    ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
+  
+  CORBA::Object ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -154,70 +169,78 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::Object ** const tmp = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
+  CORBA::Object ** const tmp =
+    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::Object* *
+ACE_INLINE
+CORBA::Object* *
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Object **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Object**, 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::Object**,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::Object**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Object* *
+ACE_INLINE
+const CORBA::Object* *
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_var
 // *************************************************************
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void) // default constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void)
   : ptr_ (0)
 {}
 
@@ -227,21 +250,26 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (IORList *p)
 {}
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void) // destructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::IORList_var &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
 {
   delete this->ptr_;
@@ -249,7 +277,8 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
   return *this;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
 {
   if (this != &p)
@@ -261,8 +290,12 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
         }
       else
         {
-          IORList *deep_copy =
-            new IORList (*p.ptr_);
+          IORList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IORList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -277,63 +310,68 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
   return *this;
 }
 
-ACE_INLINE const ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+const ::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::TAO_IOP::TAO_IOR_Manipulation::IORList &
+ACE_INLINE
+const ::TAO_IOP::TAO_IOR_Manipulation::IORList &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *&
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *&
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
 {
   delete this->ptr_;
@@ -341,7 +379,8 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
 {
   ::TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = this->ptr_;
@@ -349,12 +388,16 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_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_IOP::TAO_IOR_Manipulation::IORList_out
 // *************************************************************
@@ -367,7 +410,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList *&p)
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -375,124 +418,211 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p) // cons
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
   : ptr_ (ACE_const_cast (IORList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
 {
   this->ptr_ = ACE_const_cast (IORList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *&
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *&
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::EmptyProfileList &_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 TAO_IOP::EmptyProfileList &_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 &,TAO_IOP::EmptyProfileList&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::EmptyProfileList&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::NotFound &_tao_aggregate)
+// 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 TAO_IOP::NotFound &_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 &,TAO_IOP::NotFound&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::NotFound&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Duplicate &_tao_aggregate)
+// 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 TAO_IOP::Duplicate &_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 &,TAO_IOP::Duplicate&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::Duplicate&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Invalid_IOR &_tao_aggregate)
+// 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 TAO_IOP::Invalid_IOR &_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 &,TAO_IOP::Invalid_IOR&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::Invalid_IOR&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::MultiProfileList &_tao_aggregate)
+// 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 TAO_IOP::MultiProfileList &_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 &,TAO_IOP::MultiProfileList&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::MultiProfileList&
+  )
 {
   return 1;
 }
diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile
index 6f56519cf14..95acd6f78b3 100644
--- a/TAO/tao/IORManipulation/Makefile
+++ b/TAO/tao/IORManipulation/Makefile
@@ -67,14 +67,14 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h $(ACE_ROOT)/ace/pre.h \
+.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManipulation.h $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -101,10 +101,29 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -117,18 +136,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -138,6 +152,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -156,27 +188,11 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -190,21 +206,11 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IORC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -213,7 +219,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i IORC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
+  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Object_Loader.i IORC.h IORC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -225,21 +241,25 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -257,16 +277,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -290,14 +313,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -341,10 +356,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -415,7 +450,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -444,7 +480,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -492,6 +529,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -500,6 +547,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i IORC.i IORManipulation.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i
@@ -559,12 +608,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -577,13 +623,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -593,6 +639,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -611,35 +675,11 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
-  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -653,7 +693,30 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IORC.h IORC.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
+  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Object_Loader.i IORC.h IORC.i \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -666,10 +729,16 @@ endif
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -679,17 +748,20 @@ endif
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -709,12 +781,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -736,14 +806,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.dsp b/TAO/tao/IORManipulation/TAO_IORManip.dsp
index c4c7008d0c5..210064b50c3 100644
--- a/TAO/tao/IORManipulation/TAO_IORManip.dsp
+++ b/TAO/tao/IORManipulation/TAO_IORManip.dsp
@@ -156,6 +156,21 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\IORC.cpp

+

+!IF  "$(CFG)" == "IORManip - Win32 Release"

+

+# ADD CPP /GR

+

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

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "IORManip - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "IORManip - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File