ChangeLogTag:Tue Apr 22 14:58:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

3 files changed, 503 insertions, 1537 deletions

diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 2a01d8d4461..f16bc80a0b9 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -23,7 +23,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-#include "IORManipulation.h"
+#include "IORManip_Loader.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -34,8 +34,6 @@
 #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__ */
@@ -44,7 +42,7 @@
 #include "IORC.i"
 #endif /* !defined INLINE */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
@@ -126,7 +124,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -139,7 +137,7 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -156,20 +154,20 @@ static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
     17,
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
   };
@@ -191,7 +189,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
@@ -273,7 +271,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -286,7 +284,7 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -303,16 +301,16 @@ static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   25,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
     9,
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
   };
@@ -334,7 +332,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
@@ -416,7 +414,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -429,7 +427,7 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -446,16 +444,16 @@ static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
     10,
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
   ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
   };
@@ -477,7 +475,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
@@ -559,7 +557,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -572,7 +570,7 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -589,16 +587,16 @@ static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
-  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
+  ACE_NTOHL (0x494f523a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
     12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
   ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
   };
@@ -620,7 +618,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
@@ -702,7 +700,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -715,7 +713,7 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -732,20 +730,20 @@ static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
     17,
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
   };
@@ -773,7 +771,7 @@ TAO_NAMESPACE_END
 int TAO_IOP::TAO_IOR_Property::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_duplicate (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_duplicate (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -781,7 +779,7 @@ tao_TAO_IOP_TAO_IOR_Property_duplicate (
 }
 
 void
-tao_TAO_IOP_TAO_IOR_Property_release (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_release (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -789,15 +787,24 @@ tao_TAO_IOP_TAO_IOR_Property_release (
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_nil (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_nil (
     void
   )
 {
   return TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
+CORBA::Boolean
+TAO_IOP::tao_TAO_IOR_Property_life::tao_marshal (
+    TAO_IOP::TAO_IOR_Property_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_narrow (
+TAO_IOP::tao_TAO_IOR_Property_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -806,7 +813,7 @@ tao_TAO_IOP_TAO_IOR_Property_narrow (
 }
 
 CORBA::Object *
-tao_TAO_IOP_TAO_IOR_Property_upcast (
+TAO_IOP::tao_TAO_IOR_Property_cast::tao_upcast (
     void *src
   )
 {
@@ -815,205 +822,32 @@ 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_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void)
-  : ptr_ (TAO_IOR_Property::_nil ())
-{}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p)
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
-{}
-
-TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (TAO_IOR_Property_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Property_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return val;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_duplicate (TAO_IOR_Property_ptr p)
-{
-  return ::TAO_IOP::TAO_IOR_Property::_duplicate (p);
-}
-
-void
-TAO_IOP::TAO_IOR_Property_var::tao_release (TAO_IOR_Property_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_nil (void)
-{
-  return ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO_IOP::TAO_IOR_Property_var::tao_upcast (void *src)
-{
-  TAO_IOR_Property **tmp =
-    ACE_static_cast (TAO_IOR_Property **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO_IOP::TAO_IOR_Property,
+        TAO_IOP::tao_TAO_IOR_Property_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO_IOP::TAO_IOR_Property,
+        TAO_IOP::tao_TAO_IOR_Property_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO_IOP::TAO_IOR_Property, \
+        TAO_IOP::tao_TAO_IOR_Property_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO_IOP::TAO_IOR_Property, \
+        TAO_IOP::tao_TAO_IOR_Property_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Property_out
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p)
-  : 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)
-  : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
-{}
-
-::TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Property_out&, p).ptr_;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (TAO_IOR_Property_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
@@ -1021,7 +855,7 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-void 
+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);
@@ -1037,7 +871,7 @@ 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
@@ -1047,7 +881,7 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TAO_IOR_Property_ptr,
@@ -1067,14 +901,14 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr 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)
@@ -1093,12 +927,12 @@ void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1107,6 +941,12 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
 }
 
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1114,20 +954,20 @@ 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 (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 (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727479),
   ACE_NTOHL (0x0),  // name = TAO_IOR_Property
   };
 
@@ -1154,7 +994,7 @@ TAO_NAMESPACE_END
 int TAO_IOP::TAO_IOR_Manipulation::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_duplicate (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_duplicate (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -1162,7 +1002,7 @@ tao_TAO_IOP_TAO_IOR_Manipulation_duplicate (
 }
 
 void
-tao_TAO_IOP_TAO_IOR_Manipulation_release (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_release (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -1170,15 +1010,24 @@ tao_TAO_IOP_TAO_IOR_Manipulation_release (
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_nil (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_nil (
     void
   )
 {
   return TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
+CORBA::Boolean
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_marshal (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
+TAO_IOP::tao_TAO_IOR_Manipulation_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1187,7 +1036,7 @@ tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
 }
 
 CORBA::Object *
-tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
+TAO_IOP::tao_TAO_IOR_Manipulation_cast::tao_upcast (
     void *src
   )
 {
@@ -1196,205 +1045,32 @@ 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_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void)
-  : ptr_ (TAO_IOR_Manipulation::_nil ())
-{}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
-{}
-
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return val;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_duplicate (TAO_IOR_Manipulation_ptr p)
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p);
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation_var::tao_release (TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void)
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO_IOP::TAO_IOR_Manipulation_var::tao_upcast (void *src)
-{
-  TAO_IOR_Manipulation **tmp =
-    ACE_static_cast (TAO_IOR_Manipulation **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO_IOP::TAO_IOR_Manipulation,
+        TAO_IOP::tao_TAO_IOR_Manipulation_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO_IOP::TAO_IOR_Manipulation,
+        TAO_IOP::tao_TAO_IOR_Manipulation_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO_IOP::TAO_IOR_Manipulation, \
+        TAO_IOP::tao_TAO_IOR_Manipulation_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO_IOP::TAO_IOR_Manipulation, \
+        TAO_IOP::tao_TAO_IOR_Manipulation_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation_out
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p)
-  : 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)
-  : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
-{}
-
-::TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Manipulation_out&, p).ptr_;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 {}
@@ -1402,7 +1078,7 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void 
+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);
@@ -1418,7 +1094,7 @@ 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
@@ -1428,7 +1104,7 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TAO_IOR_Manipulation_ptr,
@@ -1448,14 +1124,14 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr 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)
@@ -1474,12 +1150,12 @@ void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1488,161 +1164,48 @@ 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)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_allocate_buffer (CORBA::ULong length)
-{
-  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;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
-}
-
-void 
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
 {
-  CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target);
-  *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return 0;
 }
 
-CORBA::Object*
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_upcast (void *src) const
-{
-  CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#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
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
 
 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 */ 
- (max)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (max)
 {}
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Object_ptr *buffer,
+    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 */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (max, length, buffer, release)
 {}
 
 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 */ 
- (seq)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (seq)
 {}
 
-TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
+TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void)
 {}
 
 void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_void_pointer)
@@ -1651,7 +1214,49 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      TAO_IOP::TAO_IOR_Manipulation::IORList,
+      TAO_Pseudo_Object_Manager<
+          CORBA::Object,
+          CORBA::Object_var
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      TAO_IOP::TAO_IOR_Manipulation::IORList,
+      TAO_IOP::TAO_IOR_Manipulation::IORList_var,
+      TAO_Pseudo_Object_Manager<
+          CORBA::Object,
+          CORBA::Object_var
+        >
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      TAO_IOP::TAO_IOR_Manipulation::IORList, \
+      TAO_Pseudo_Object_Manager< \
+          CORBA::Object, \
+          CORBA::Object_var \
+        > \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      TAO_IOP::TAO_IOR_Manipulation::IORList, \
+      TAO_IOP::TAO_IOR_Manipulation::IORList_var, \
+      TAO_Pseudo_Object_Manager< \
+          CORBA::Object, \
+          CORBA::Object_var \
+        > \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1660,25 +1265,41 @@ 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 (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 (0x494f524c),
   ACE_NTOHL (0x69737400),  // name = IORList
     CORBA::tk_sequence, // typecode kind
-  60, // encapsulation length
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-        0U,
+    CORBA::tk_objref,
+    52, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      29,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4f62),
+      ACE_NTOHL (0x6a656374),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+            7,
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63740000),  // name = Object
+
+    0U,
 
 };
 
@@ -1700,22 +1321,22 @@ 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 (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 (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
   };
 
@@ -1736,7 +1357,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1798,10 +1419,10 @@ CORBA::Boolean operator>>= (
     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>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1863,10 +1484,10 @@ CORBA::Boolean operator>>= (
     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>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::NotFound \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1928,10 +1549,10 @@ CORBA::Boolean operator>>= (
     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>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1993,10 +1614,10 @@ CORBA::Boolean operator>>= (
     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>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2058,7 +1679,7 @@ CORBA::Boolean operator>>= (
     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>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -2168,4 +1789,3 @@ operator>>= (
 # 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 */
-
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 23fd74a2366..da743c0d3d4 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -26,7 +26,7 @@
 #define _TAO_IDL_ORIG_IORC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/Exception.h"
 
 #ifndef TAO_IORMANIP_SAFE_INCLUDE
 #error "You should not include IORC.h directly, use IORManip_Loader.h"
@@ -37,7 +37,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ior_manip_export.h"
-#include "tao/Exception.h"
 #include "tao/Object.h"
 #include "tao/Sequence.h"
 #include "tao/Any_T.h"
@@ -70,25 +69,25 @@
 
 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 EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -100,43 +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_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 NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -148,43 +147,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_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 Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -196,43 +195,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_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 Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -244,43 +243,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_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 MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -292,114 +291,77 @@ 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_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
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_TAO_IOP_TAO_IOR_PROPERTY__ODDS_N_ENDS_CH_)
+#define _TAO_IOP_TAO_IOR_PROPERTY__ODDS_N_ENDS_CH_
 
-#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
+  struct tao_TAO_IOR_Property_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        TAO_IOR_Property,
+        tao_TAO_IOR_Property_life
+      >
+    TAO_IOR_Property_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        TAO_IOR_Property,
+        tao_TAO_IOR_Property_life
+      >
+    TAO_IOR_Property_out;
+
+  struct TAO_IORManip_Export tao_TAO_IOR_Property_life
   {
-  public:
-    TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
-    TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
-    ~TAO_IOR_Property_var (void); // destructor
-    
-    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 
-    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);
     static void tao_release (TAO_IOR_Property_ptr);
     static TAO_IOR_Property_ptr tao_nil (void);
-    static TAO_IOR_Property_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TAO_IOR_Property_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TAO_IOR_Property_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TAO_IOR_Property_var (const TAO_Base_var &rhs);
-    TAO_IOR_Property_var &operator= (const TAO_Base_var &rhs);
   };
 
-#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
+  struct TAO_IORManip_Export tao_TAO_IOR_Property_cast
   {
-  public:
-    TAO_IOR_Property_out (TAO_IOR_Property_ptr &);
-    TAO_IOR_Property_out (TAO_IOR_Property_var &);
-    TAO_IOR_Property_out (const TAO_IOR_Property_out &);
-    TAO_IOR_Property_out &operator= (const TAO_IOR_Property_out &);
-    TAO_IOR_Property_out &operator= (const TAO_IOR_Property_var &);
-    TAO_IOR_Property_out &operator= (TAO_IOR_Property_ptr);
-    operator TAO_IOR_Property_ptr &();
-    TAO_IOR_Property_ptr &ptr (void);
-    TAO_IOR_Property_ptr operator-> (void);
-  
-  private:
-    TAO_IOR_Property_ptr &ptr_;
+    static TAO_IOR_Property_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #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
   {
@@ -407,30 +369,30 @@ TAO_NAMESPACE  TAO_IOP
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
     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
@@ -439,10 +401,10 @@ TAO_NAMESPACE  TAO_IOP
         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
@@ -453,10 +415,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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
@@ -465,10 +427,10 @@ TAO_NAMESPACE  TAO_IOP
         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
@@ -476,124 +438,83 @@ TAO_NAMESPACE  TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     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
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__ODDS_N_ENDS_CH_)
+#define _TAO_IOP_TAO_IOR_MANIPULATION__ODDS_N_ENDS_CH_
 
-#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
+  struct tao_TAO_IOR_Manipulation_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        TAO_IOR_Manipulation,
+        tao_TAO_IOR_Manipulation_life
+      >
+    TAO_IOR_Manipulation_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        TAO_IOR_Manipulation,
+        tao_TAO_IOR_Manipulation_life
+      >
+    TAO_IOR_Manipulation_out;
+
+  struct TAO_IORManip_Export tao_TAO_IOR_Manipulation_life
   {
-  public:
-    TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
-    TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-    ~TAO_IOR_Manipulation_var (void); // destructor
-    
-    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 
-    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);
     static void tao_release (TAO_IOR_Manipulation_ptr);
     static TAO_IOR_Manipulation_ptr tao_nil (void);
-    static TAO_IOR_Manipulation_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TAO_IOR_Manipulation_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TAO_IOR_Manipulation_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
-    TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
   };
 
-#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
+  struct TAO_IORManip_Export tao_TAO_IOR_Manipulation_cast
   {
-  public:
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-    operator TAO_IOR_Manipulation_ptr &();
-    TAO_IOR_Manipulation_ptr &ptr (void);
-    TAO_IOR_Manipulation_ptr operator-> (void);
-  
-  private:
-    TAO_IOR_Manipulation_ptr &ptr_;
+    static TAO_IOR_Manipulation_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #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
   {
@@ -601,208 +522,85 @@ TAO_NAMESPACE  TAO_IOP
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
     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_IORManip_Export _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::Object* *value,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
-          const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
-        );
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (
-          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);
-      CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::Object* *get_buffer (void) const;
-      virtual void _shrink_buffer (
-          CORBA::ULong nl,
-          CORBA::ULong ol
-        );
-      
-      virtual void _downcast (
-          void* target,
-          CORBA::Object *src
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      virtual CORBA::Object* _upcast (void *src) const;
-    };
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    static void _tao_any_destructor (void *);
 
-#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
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
     class IORList;
-    class IORList_var;
-    
-    // *************************************************************
-    // 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
-
-#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 */ 
+
+    typedef
+      TAO_MngSeq_Var_T<
+          IORList,
+          TAO_Pseudo_Object_Manager<
+              CORBA::Object,
+              CORBA::Object
+            >
+        >
+      IORList_var;
+
+    typedef
+      TAO_MngSeq_Out_T<
+          IORList,
+          IORList_var,
+          TAO_Pseudo_Object_Manager<
+              CORBA::Object,
+              CORBA::Object
+            >
+        >
+      IORList_out;
+
+    class TAO_IORManip_Export IORList
+      : public
+          TAO_Unbounded_Pseudo_Sequence<
+              CORBA::Object,
+              CORBA::Object_var
+            >
     {
     public:
       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 &);
       ~IORList (void);
-      
-      static void _tao_any_destructor (void*);
-      
-      typedef IORList_var _var_type;
-    };
-
-#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:
-      IORList_var (void);
-      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;
-      
-      // Variable-size base types only.
-      operator IORList *&();
-      
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      
-      // in, inout, out, _retn 
-      const IORList &in (void) const;
-      IORList &inout (void);
-      IORList *&out (void);
-      IORList *_retn (void);
-      IORList *ptr (void) const;
-    
-    private:
-      IORList *ptr_;
-    };
 
-#endif /* end #if !defined */
+      static void _tao_any_destructor (void *);
 
-#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:
-      IORList_out (IORList *&);
-      IORList_out (IORList_var &);
-      IORList_out (const IORList_out &);
-      IORList_out &operator= (const IORList_out &);
-      IORList_out &operator= (IORList *);
-      operator IORList *&();
-      IORList *&ptr (void);
-      IORList *operator-> (void);
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-    
-    private:
-      IORList *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const IORList_var &);
+      typedef IORList_var _var_type;
     };
 
-#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
@@ -813,10 +611,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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
@@ -828,10 +626,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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
@@ -843,10 +641,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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
@@ -857,10 +655,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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,
@@ -874,10 +672,10 @@ TAO_NAMESPACE  TAO_IOP
         , 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
@@ -887,10 +685,10 @@ TAO_NAMESPACE  TAO_IOP
         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
@@ -899,10 +697,10 @@ TAO_NAMESPACE  TAO_IOP
       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
@@ -912,10 +710,10 @@ TAO_NAMESPACE  TAO_IOP
         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
@@ -924,33 +722,29 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::EmptyProfileList
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     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
@@ -1062,7 +856,7 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IORC.i"
@@ -1078,4 +872,3 @@ 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 d9ffd5b1525..1b26f72c621 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -26,13 +26,6 @@
 #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;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -62,451 +55,12 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
 
 #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 **
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::Object **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::Object::_nil ();
-    }
-  
-  return buf;
-}
-
-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;
-    }
-  
-  delete[] buffer;
-}
-
-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 (void)
-{
-}
-
-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)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (maximum))
-{
-}
-
-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)
-{
-}
-
-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_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;
-    }
-  else
-    {
-      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
-  )
-{
-  if (this == &rhs)
-    {
-      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 ();
-        }
-      
-      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_);
-        }
-    }
-  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_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-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
-{
-  ACE_ASSERT (index < this->maximum_);
-  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* *
-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_);
-        }
-    }
-  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;
-        }
-    }
-  
-  return result;
-}
-
-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_);
-}
-
-#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)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (IORList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-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_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IORList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IORList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IORList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-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 *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast 
-{
-  return *this->ptr_;
-}
-
-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.
-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>
-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 &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-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_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-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
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-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 &
-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 &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-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 *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-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>
-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;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -537,7 +91,7 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -566,7 +120,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -595,7 +149,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -624,7 +178,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -653,7 +207,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -680,4 +234,3 @@ CORBA::Boolean operator>> (
 {
   return 1;
 }
-