ChangeLogTag:Thu Jul 06 16:57:38 2000 Nanbor Wang <nanbor@cs.wustl.edu>

16 files changed, 140 insertions, 2283 deletions

diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 222f9b6b62a..4a0bd21f03e 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -57,7 +57,9 @@ CORBA_Exception::CORBA_Exception (void)
 CORBA_Exception::~CORBA_Exception (void)
 {
   ACE_ASSERT (this->refcount_ == 0);
-  ACE_ASSERT (this->type_ != 0);
+  // NW: Since local exception doesn't have a valid type, I commented
+  // the following assertion out.
+  //  ACE_ASSERT (this->type_ != 0);
   CORBA::release (this->type_);
 }
 
diff --git a/TAO/tao/IOR.pidl b/TAO/tao/IOR.pidl
index cfc7184c8e7..1b350238e6e 100644
--- a/TAO/tao/IOR.pidl
+++ b/TAO/tao/IOR.pidl
@@ -19,7 +19,7 @@
 
 module TAO_IOP {
 
-  interface TAO_IOR_Manipulation {
+  local interface TAO_IOR_Manipulation {
 
     exception EmptyProfileList {};
     exception NotFound {};
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
index bc1cf6069d1..b0f005a28dd 100644
--- a/TAO/tao/IORC.cpp
+++ b/TAO/tao/IORC.cpp
@@ -1,6 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
-
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -9,18 +7,12 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/IORC.h"
+#include "IORC.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IORC.i"
+#include "IORC.i"
 #endif /* !defined INLINE */
 
-#include "tao/IORS.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/NVList.h"
-
-ACE_RCSID(tao, IORC, "$Id$")
 
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
@@ -30,26 +22,11 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *x)
-{
-  TAO_IOR_Manipulation *tmp = ACE_static_cast (TAO_IOR_Manipulation*,x);
-  CORBA::release (tmp);
-}
-
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  if (CORBA::is_nil (obj))
-    return TAO_IOR_Manipulation::_nil ();
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (TAO_IOR_Manipulation::_nil ());
-      if (is_a == 0)
-        return TAO_IOR_Manipulation::_nil ();
-    }
   return TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
@@ -60,23 +37,7 @@ TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narr
 {
   if (CORBA::is_nil (obj))
     return TAO_IOR_Manipulation::_nil ();
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
-      TAO_IOR_Manipulation_ptr default_proxy = TAO_IOR_Manipulation::_nil ();
-
-      if (obj->_is_collocated () && _TAO_collocation_TAO_IOP_TAO_IOR_Manipulation_Stub_Factory_function_pointer != 0)
-        {
-          default_proxy = _TAO_collocation_TAO_IOP_TAO_IOR_Manipulation_Stub_Factory_function_pointer (obj);
-        }
-      if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, TAO_IOR_Manipulation (stub), TAO_IOR_Manipulation::_nil ());
-      return default_proxy;
-    }
-  else
-    return
+  return
       ACE_reinterpret_cast
         (
           TAO_IOR_Manipulation_ptr,
@@ -101,7 +62,6 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
 
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (void)
-  : CORBA_UserException (::TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList)
 {
 }
 
@@ -110,12 +70,6 @@ TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::~EmptyProfileList (void)
 {
 }
 
-void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_any_destructor (void *x)
-{
-  EmptyProfileList *tmp = ACE_static_cast (EmptyProfileList*,x);
-  delete tmp;
-}
-
 // copy constructor
 TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
   : CORBA_UserException (_tao_excp._type ())
@@ -149,21 +103,17 @@ void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_raise ()
 
 
 void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_encode (
-    TAO_OutputCDR &cdr,
+    TAO_OutputCDR &,
     CORBA::Environment &ACE_TRY_ENV) const
 {
-  if (cdr << *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_decode (
-    TAO_InputCDR &cdr,
+    TAO_InputCDR &,
     CORBA::Environment &ACE_TRY_ENV)
 {
-  if (cdr >> *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -175,19 +125,8 @@ CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc (void)
   return retval;
 }
 
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  54, 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 (0x2f456d70), ACE_NTOHL (0x74795072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x654c6973), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0
-  17, ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = EmptyProfileList
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList;
-
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (void)
-  : CORBA_UserException (::TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound)
 {
 }
 
@@ -196,12 +135,6 @@ TAO_IOP::TAO_IOR_Manipulation::NotFound::~NotFound (void)
 {
 }
 
-void TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_any_destructor (void *x)
-{
-  NotFound *tmp = ACE_static_cast (NotFound*,x);
-  delete tmp;
-}
-
 // copy constructor
 TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (const ::TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
   : CORBA_UserException (_tao_excp._type ())
@@ -235,21 +168,17 @@ void TAO_IOP::TAO_IOR_Manipulation::NotFound::_raise ()
 
 
 void TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr,
+    TAO_OutputCDR &,
     CORBA::Environment &ACE_TRY_ENV) const
 {
-  if (cdr << *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 void TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_decode (
-    TAO_InputCDR &cdr,
+    TAO_InputCDR &,
     CORBA::Environment &ACE_TRY_ENV)
 {
-  if (cdr >> *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -261,19 +190,8 @@ CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc (void)
   return retval;
 }
 
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_NotFound[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, 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 (0x2f4e6f74), ACE_NTOHL (0x466f756e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0
-  9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0),  // name = NotFound
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::NotFound));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound;
-
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (void)
-  : CORBA_UserException (::TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate)
 {
 }
 
@@ -282,12 +200,6 @@ TAO_IOP::TAO_IOR_Manipulation::Duplicate::~Duplicate (void)
 {
 }
 
-void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_any_destructor (void *x)
-{
-  Duplicate *tmp = ACE_static_cast (Duplicate*,x);
-  delete tmp;
-}
-
 // copy constructor
 TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (const ::TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
   : CORBA_UserException (_tao_excp._type ())
@@ -321,21 +233,17 @@ void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_raise ()
 
 
 void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_encode (
-    TAO_OutputCDR &cdr,
+    TAO_OutputCDR &,
     CORBA::Environment &ACE_TRY_ENV) const
 {
-  if (cdr << *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_decode (
-    TAO_InputCDR &cdr,
+    TAO_InputCDR &,
     CORBA::Environment &ACE_TRY_ENV)
 {
-  if (cdr >> *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -347,19 +255,8 @@ CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc (void)
   return retval;
 }
 
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, 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 (0x2f447570), ACE_NTOHL (0x6c696361), ACE_NTOHL (0x74653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0
-  10, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x65000000),  // name = Duplicate
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Duplicate));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate;
-
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (void)
-  : CORBA_UserException (::TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR)
 {
 }
 
@@ -368,12 +265,6 @@ TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::~Invalid_IOR (void)
 {
 }
 
-void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_any_destructor (void *x)
-{
-  Invalid_IOR *tmp = ACE_static_cast (Invalid_IOR*,x);
-  delete tmp;
-}
-
 // copy constructor
 TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
   : CORBA_UserException (_tao_excp._type ())
@@ -407,21 +298,17 @@ void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_raise ()
 
 
 void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_encode (
-    TAO_OutputCDR &cdr,
+    TAO_OutputCDR &,
     CORBA::Environment &ACE_TRY_ENV) const
 {
-  if (cdr << *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_decode (
-    TAO_InputCDR &cdr,
+    TAO_InputCDR &,
     CORBA::Environment &ACE_TRY_ENV)
 {
-  if (cdr >> *this)
-    return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -433,19 +320,9 @@ CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc (void)
   return retval;
 }
 
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, 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 (0x2f496e76), ACE_NTOHL (0x616c6964), ACE_NTOHL (0x5f494f52), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0
-  12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR;
-
 
 #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_
 
@@ -455,7 +332,7 @@ CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc
   {
     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_);
@@ -464,14 +341,14 @@ CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc
           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)
   {
@@ -486,24 +363,24 @@ CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc
     _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
+  void 
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
       void* target,
       CORBA_Object *src,
@@ -520,11 +397,11 @@ CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc
     CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
     return *tmp;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
@@ -536,30 +413,30 @@ CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
@@ -573,702 +450,6 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-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
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    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,
-
-};
-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;
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "merge_iors",
-      10,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    TAO_ClientRequestInterceptor_Adapter
-      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
-    ACE_CHECK_RETURN (0);
-    PortableInterceptor::Cookies _tao_cookies;
-    CORBA::NVList_var _tao_interceptor_args;
-    if (_tao_vfr.valid ())
-      {
-        istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
-      }
-
-    ACE_TRY
-      {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      for (;;)
-      {
-        _tao_call.start (ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.preinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "merge_iors",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-        _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-        if (!(
-              (_tao_out << iors)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), 0);
-
-        int _invoke_status =
-          _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata, 3, ACE_TRY_ENV);
-                TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        if (_invoke_status == TAO_INVOKE_RESTART)
-          continue;
-        if (_invoke_status != TAO_INVOKE_OK)
-        {
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        }
-        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-        if (!(
-              (_tao_in >> _tao_safe_retval.inout ())
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.postinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "merge_iors",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        break;
-
-      }
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-    }
-  ACE_CATCHANY
-    {
-      _tao_vfr.exception_occurred (
-          _tao_call.request_id (),
-          1,
-          this,
-          "merge_iors",
-          _tao_cookies,
-          ACE_TRY_ENV
-        );
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-#endif /* TAO_HAS_INTERCEPTORS */
-  return _tao_safe_retval._retn ();
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "add_profiles",
-      12,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    TAO_ClientRequestInterceptor_Adapter
-      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
-    ACE_CHECK_RETURN (0);
-    PortableInterceptor::Cookies _tao_cookies;
-    CORBA::NVList_var _tao_interceptor_args;
-    if (_tao_vfr.valid ())
-      {
-        istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
-      }
-
-    ACE_TRY
-      {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      for (;;)
-      {
-        _tao_call.start (ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.preinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "add_profiles",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-        _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-        if (!(
-              (_tao_out << ior1) &&
-              (_tao_out << ior2)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), 0);
-
-        int _invoke_status =
-          _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata, 3, ACE_TRY_ENV);
-                TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        if (_invoke_status == TAO_INVOKE_RESTART)
-          continue;
-        if (_invoke_status != TAO_INVOKE_OK)
-        {
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        }
-        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-        if (!(
-              (_tao_in >> _tao_safe_retval.inout ())
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.postinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "add_profiles",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        break;
-
-      }
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-    }
-  ACE_CATCHANY
-    {
-      _tao_vfr.exception_occurred (
-          _tao_call.request_id (),
-          1,
-          this,
-          "add_profiles",
-          _tao_cookies,
-          ACE_TRY_ENV
-        );
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-#endif /* TAO_HAS_INTERCEPTORS */
-  return _tao_safe_retval._retn ();
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  CORBA::Object_var _tao_safe_retval (_tao_retval);
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "remove_profiles",
-      15,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    TAO_ClientRequestInterceptor_Adapter
-      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
-    ACE_CHECK_RETURN (0);
-    PortableInterceptor::Cookies _tao_cookies;
-    CORBA::NVList_var _tao_interceptor_args;
-    if (_tao_vfr.valid ())
-      {
-        istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
-      }
-
-    ACE_TRY
-      {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      for (;;)
-      {
-        _tao_call.start (ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.preinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "remove_profiles",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-        _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-        if (!(
-              (_tao_out << ior1) &&
-              (_tao_out << ior2)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), 0);
-
-        int _invoke_status =
-          _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata, 3, ACE_TRY_ENV);
-                TAO_INTERCEPTOR_CHECK_RETURN (0);
-
-        if (_invoke_status == TAO_INVOKE_RESTART)
-          continue;
-        if (_invoke_status != TAO_INVOKE_OK)
-        {
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        }
-        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-        if (!(
-              (_tao_in >> _tao_safe_retval.inout ())
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.postinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "remove_profiles",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN (0);
-        break;
-
-      }
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-    }
-  ACE_CATCHANY
-    {
-      _tao_vfr.exception_occurred (
-          _tao_call.request_id (),
-          1,
-          this,
-          "remove_profiles",
-          _tao_cookies,
-          ACE_TRY_ENV
-        );
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-#endif /* TAO_HAS_INTERCEPTORS */
-  return _tao_safe_retval._retn ();
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_in_ior",
-      9,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    TAO_ClientRequestInterceptor_Adapter
-      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
-    ACE_CHECK_RETURN  (_tao_retval);
-    PortableInterceptor::Cookies _tao_cookies;
-    CORBA::NVList_var _tao_interceptor_args;
-    if (_tao_vfr.valid ())
-      {
-        istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV);
-        ACE_CHECK_RETURN  (_tao_retval);
-      }
-
-    ACE_TRY
-      {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      for (;;)
-      {
-        _tao_call.start (ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.preinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "is_in_ior",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-        CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-        _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-        if (!(
-              (_tao_out << ior1) &&
-              (_tao_out << ior2)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-        int _invoke_status =
-          _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata, 1, ACE_TRY_ENV);
-                TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        if (_invoke_status == TAO_INVOKE_RESTART)
-          continue;
-        if (_invoke_status != TAO_INVOKE_OK)
-        {
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-        }
-        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-        if (!(
-              (_tao_in >> _tao_retval)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.postinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "is_in_ior",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-        break;
-
-      }
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-    }
-  ACE_CATCHANY
-    {
-      _tao_vfr.exception_occurred (
-          _tao_call.request_id (),
-          1,
-          this,
-          "is_in_ior",
-          _tao_cookies,
-          ACE_TRY_ENV
-        );
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN  (_tao_retval);
-#endif /* TAO_HAS_INTERCEPTORS */
-  return _tao_retval;
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_profile_count",
-      17,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    TAO_ClientRequestInterceptor_Adapter
-      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
-    ACE_CHECK_RETURN  (_tao_retval);
-    PortableInterceptor::Cookies _tao_cookies;
-    CORBA::NVList_var _tao_interceptor_args;
-    if (_tao_vfr.valid ())
-      {
-        istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV);
-        ACE_CHECK_RETURN  (_tao_retval);
-      }
-
-    ACE_TRY
-      {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      for (;;)
-      {
-        _tao_call.start (ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.preinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "get_profile_count",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-        CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-        _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-        if (!(
-              (_tao_out << ior)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-        int _invoke_status =
-          _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata, 1, ACE_TRY_ENV);
-                TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
-        if (_invoke_status == TAO_INVOKE_RESTART)
-          continue;
-        if (_invoke_status != TAO_INVOKE_OK)
-        {
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-        }
-        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-        if (!(
-              (_tao_in >> _tao_retval)
-          ))
-          TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-        TAO_INTERCEPTOR (
-            _tao_vfr.postinvoke (
-                _tao_call.request_id (),
-                1,
-                this,
-                "get_profile_count",
-                _tao_call.service_info (),
-                _tao_interceptor_args.inout (),
-                _tao_cookies,
-                ACE_TRY_ENV
-              )
-          );
-        TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-        break;
-
-      }
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-    }
-  ACE_CATCHANY
-    {
-      _tao_vfr.exception_occurred (
-          _tao_call.request_id (),
-          1,
-          this,
-          "get_profile_count",
-          _tao_cookies,
-          ACE_TRY_ENV
-        );
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN  (_tao_retval);
-#endif /* TAO_HAS_INTERCEPTORS */
-  return _tao_retval;
-}
-
-CORBA::Boolean TAO_IOP::TAO_IOR_Manipulation::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
 void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
@@ -1279,7 +460,7 @@ void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1290,72 +471,6 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
 
-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_IOP::TAO_IOR_Manipulation_ptr (*_TAO_collocation_TAO_IOP_TAO_IOR_Manipulation_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem)
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        TAO_IOP::_tc_TAO_IOR_Manipulation,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem),
-        TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor
-      );
-  }
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::_tc_TAO_IOR_Manipulation, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          TAO_IOP::_tc_TAO_IOR_Manipulation,
-          1,
-          _tao_elem,
-          TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor
-        );
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return 0;
-}
-
 #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>;
@@ -1363,485 +478,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
   #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::TAO_IOR_Manipulation::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/TAO_IOR_Manipulation/EmptyProfileList:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList,
-            1,
-            tmp,
-            TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::TAO_IOR_Manipulation::NotFound*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::NotFound *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::TAO_IOR_Manipulation::NotFound *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::TAO_IOR_Manipulation::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/TAO_IOR_Manipulation/NotFound:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound,
-            1,
-            tmp,
-            TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::TAO_IOR_Manipulation::Duplicate*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Duplicate *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Duplicate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::TAO_IOR_Manipulation::Duplicate *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::TAO_IOR_Manipulation::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/TAO_IOR_Manipulation/Duplicate:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate,
-            1,
-            tmp,
-            TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::TAO_IOR_Manipulation::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/TAO_IOR_Manipulation/Invalid_IOR:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR,
-            1,
-            tmp,
-            TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::TAO_IOR_Manipulation::IORList*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const TAO_IOP::TAO_IOR_Manipulation::IORList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::TAO_IOR_Manipulation::IORList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::TAO_IOR_Manipulation::IORList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
-            1,
-            ACE_static_cast (void *, tmp),
-            TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index ed0e5b71a70..a804ac24dbe 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -10,16 +9,12 @@
 
 #ifndef _TAO_IDL_IORC_H_
 #define _TAO_IDL_IORC_H_
-#include "ace/pre.h"
 
-#include "ace/OS.h"
 #include "tao/corbafwd.h"
-#include "tao/Environment.h"
-#include "tao/CDR.h"
 #include "tao/Object.h"
-#include "tao/Sequence.h"
 #include "tao/Exception.h"
-#include "tao/Typecode.h"
+#include "tao/Environment.h"
+#include "tao/Sequence.h"
 
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
 #include "ace/streams.h"
@@ -33,13 +28,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO 
+#define TAO_EXPORT_MACRO TAO_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO 
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -57,7 +52,7 @@ TAO_NAMESPACE  TAO_IOP
 
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -68,17 +63,17 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr);
+    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);
@@ -111,7 +106,7 @@ TAO_NAMESPACE  TAO_IOP
     operator TAO_IOR_Manipulation_ptr &();
     TAO_IOR_Manipulation_ptr &ptr (void);
     TAO_IOR_Manipulation_ptr operator-> (void);
-    
+
   private:
     TAO_IOR_Manipulation_ptr &ptr_;
   };
@@ -135,12 +130,12 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static TAO_IOR_Manipulation_ptr _nil (void)
@@ -148,8 +143,6 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         return (TAO_IOR_Manipulation_ptr)0;
       }
 
-    static void _tao_any_destructor (void*);
-
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_
@@ -162,7 +155,6 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     EmptyProfileList (void); // default ctor
     EmptyProfileList (const EmptyProfileList &); // copy ctor
     ~EmptyProfileList (void);
-    static void _tao_any_destructor (void*);
     EmptyProfileList &operator= (const EmptyProfileList &);
 
 
@@ -183,8 +175,6 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
   }; // exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
 
-    static CORBA::TypeCode_ptr _tc_EmptyProfileList;
-
 
 #endif /* end #if !defined */
 
@@ -200,7 +190,6 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
   NotFound (void); // default ctor
   NotFound (const NotFound &); // copy ctor
   ~NotFound (void);
-  static void _tao_any_destructor (void*);
   NotFound &operator= (const NotFound &);
 
 
@@ -221,8 +210,6 @@ class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
 }; // exception TAO_IOP::TAO_IOR_Manipulation::NotFound
 
-static CORBA::TypeCode_ptr _tc_NotFound;
-
 
 #endif /* end #if !defined */
 
@@ -238,7 +225,6 @@ public:
 Duplicate (void); // default ctor
 Duplicate (const Duplicate &); // copy ctor
 ~Duplicate (void);
-static void _tao_any_destructor (void*);
 Duplicate &operator= (const Duplicate &);
 
 
@@ -259,8 +245,6 @@ static CORBA::Exception *_alloc (void);
 
 }; // exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
 
-static CORBA::TypeCode_ptr _tc_Duplicate;
-
 
 #endif /* end #if !defined */
 
@@ -276,7 +260,6 @@ public:
 Invalid_IOR (void); // default ctor
 Invalid_IOR (const Invalid_IOR &); // copy ctor
 ~Invalid_IOR (void);
-static void _tao_any_destructor (void*);
 Invalid_IOR &operator= (const Invalid_IOR &);
 
 
@@ -297,14 +280,12 @@ static CORBA::Exception *_alloc (void);
 
 }; // exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
 
-static CORBA::TypeCode_ptr _tc_Invalid_IOR;
-
 
 #endif /* end #if !defined */
 
 
 #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_
 
@@ -312,7 +293,7 @@ static CORBA::TypeCode_ptr _tc_Invalid_IOR;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
@@ -334,17 +315,17 @@ static CORBA::TypeCode_ptr _tc_Invalid_IOR;
     virtual void _downcast (
         void* target,
         CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
+        CORBA_Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     virtual CORBA_Object* _upcast (void *src) const;
-    
+
   };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
@@ -356,20 +337,20 @@ class IORList_var;
 // IORList
 // *************************************************************
 
-class TAO_Export IORList : public 
+class TAO_Export IORList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   IORList (void); // default ctor
   IORList (CORBA::ULong max); // uses max size
   IORList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA::Object_ptr *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Object_ptr *buffer,
     CORBA::Boolean release=0
   );
   IORList (const IORList &); // copy ctor
@@ -399,19 +380,19 @@ public:
   IORList_var (IORList *);
   IORList_var (const IORList_var &); // copy constructor
   ~IORList_var (void); // destructor
-  
+
   IORList_var &operator= (IORList *);
   IORList_var &operator= (const IORList_var &);
   IORList *operator-> (void);
   const IORList *operator-> (void) const;
-  
+
   operator const IORList &() const;
   operator IORList &();
   operator IORList &() const;
   operator IORList *&(); // variable-size base types only
-  
+
   TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const IORList &in (void) const;
   IORList &inout (void);
   IORList *&out (void);
@@ -441,7 +422,7 @@ public:
   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
@@ -451,11 +432,9 @@ private:
 
 #endif /* end #if !defined */
 
-static CORBA::TypeCode_ptr _tc_IORList;
-
 virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -463,12 +442,12 @@ virtual CORBA::Object_ptr merge_iors (
     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
     TAO_IOP::TAO_IOR_Manipulation::Duplicate,
     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ));
+  )) = 0;
 
 virtual CORBA::Object_ptr add_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -476,12 +455,12 @@ virtual CORBA::Object_ptr add_profiles (
     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
     TAO_IOP::TAO_IOR_Manipulation::Duplicate,
     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ));
+  )) = 0;
 
 virtual CORBA::Object_ptr remove_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -489,44 +468,35 @@ virtual CORBA::Object_ptr remove_profiles (
     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
     TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ));
+  )) = 0;
 
 virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ));
+  )) = 0;
 
 virtual CORBA::ULong get_profile_count (
     CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ));
+  )) = 0;
 
-virtual CORBA::Boolean _is_a (
-    const CORBA::Char *type_id, 
-    CORBA::Environment &ACE_TRY_ENV = 
-      TAO_default_environment ()
-  );
 virtual void *_tao_QueryInterface (ptr_arith_t type);
 
 virtual const char* _interface_repository_id (void) const;
 
 protected:
   TAO_IOR_Manipulation (void);
-  TAO_IOR_Manipulation (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
-      CORBA::Boolean _tao_collocated = 0
-    );
   virtual ~TAO_IOR_Manipulation (void);
 private:
   TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
@@ -536,142 +506,23 @@ private:
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
-
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_IOP
 
-extern  TAO_IOP::TAO_IOR_Manipulation_ptr (*_TAO_collocation_TAO_IOP_TAO_IOR_Manipulation_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-// Any operators for interface TAO_IOP::TAO_IOR_Manipulation
-TAO_Export void operator<<= (CORBA::Any &, 
-                             TAO_IOP::TAO_IOR_Manipulation_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, 
-                                       TAO_IOP::TAO_IOR_Manipulation *&);
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &); // copying version
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList*); // noncopying version
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&); // deprecated
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&);
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::NotFound &); // copying version
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::NotFound*); // noncopying version
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::NotFound *&); // deprecated
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::NotFound *&);
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::Duplicate &); // copying version
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::Duplicate*); // noncopying version
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::Duplicate *&); // deprecated
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::Duplicate *&);
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &); // copying version
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR*); // noncopying version
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&); // deprecated
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&);
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
-TAO_Export void 
-operator<<= (CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             TAO_IOP::TAO_IOR_Manipulation::IORList *&); // deprecated
-TAO_Export CORBA::Boolean 
-operator>>= (const CORBA::Any &, 
-             const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean 
-operator<< (TAO_OutputCDR &, 
-            const TAO_IOP::TAO_IOR_Manipulation_ptr );
-TAO_Export CORBA::Boolean 
-operator>> (TAO_InputCDR &, 
-            TAO_IOP::TAO_IOR_Manipulation_ptr &);
-TAO_Export CORBA::Boolean 
-operator<< (TAO_OutputCDR &, 
-            const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-TAO_Export CORBA::Boolean 
-operator>> (TAO_InputCDR &, 
-            TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-
-TAO_Export CORBA::Boolean 
-operator<< (TAO_OutputCDR &, 
-            const TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-TAO_Export CORBA::Boolean 
-operator>> (TAO_InputCDR &, 
-            TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-
-TAO_Export CORBA::Boolean 
-operator<< (TAO_OutputCDR &, 
-            const TAO_IOP::TAO_IOR_Manipulation::Duplicate &);
-TAO_Export CORBA::Boolean 
-operator>> (TAO_InputCDR &, 
-            TAO_IOP::TAO_IOR_Manipulation::Duplicate &);
-
-TAO_Export CORBA::Boolean 
-operator<< (TAO_OutputCDR &, 
-            const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &);
-TAO_Export CORBA::Boolean 
-operator>> (TAO_InputCDR &, 
-            TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &);
-
-#if !defined _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_H_
-#define _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_H_ */
-
 
 #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
-#include "tao/IORC.i"
+#include "IORC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IORC.i b/TAO/tao/IORC.i
index 7efde709b5f..b67dc7b5019 100644
--- a/TAO/tao/IORC.i
+++ b/TAO/tao/IORC.i
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -8,6 +7,23 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// *************************************************************
+// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
+// *************************************************************
+
+// *************************************************************
+// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::NotFound
+// *************************************************************
+
+// *************************************************************
+// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
+// *************************************************************
+
+// *************************************************************
+// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
+// *************************************************************
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
@@ -357,11 +373,6 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_
@@ -375,11 +386,6 @@ TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default co
   : ptr_ (TAO_IOR_Manipulation::_nil ())
 {}
 
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p)
-  : ptr_ (p)
-{}
-
 ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
 {
@@ -537,122 +543,3 @@ TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList&)
-{
-  return 1;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::TAO_IOR_Manipulation::NotFound&)
-{
-  return 1;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::TAO_IOR_Manipulation::Duplicate&)
-{
-  return 1;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR&)
-{
-  return 1;
-}
-
-#if !defined _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_I_
-#define _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_I_
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_IOP_TAO_IOR_Manipulation_IORList_I_ */
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp
index f55c88081dc..6479afe0491 100644
--- a/TAO/tao/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation.cpp
@@ -32,6 +32,20 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
 {
 }
 
+void
+TAO_IOR_Manipulation_impl::_add_ref (void)
+{
+  this->_incr_refcnt ();
+  // This is a TAO specific implementation.
+}
+
+void
+TAO_IOR_Manipulation_impl::_remove_ref (void)
+{
+  this->_decr_refcnt ();
+  // This is a TAO specific implementation.
+}
+
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
diff --git a/TAO/tao/IORManipulation.h b/TAO/tao/IORManipulation.h
index 9362a122730..1a175bc09d1 100644
--- a/TAO/tao/IORManipulation.h
+++ b/TAO/tao/IORManipulation.h
@@ -21,15 +21,24 @@
 #define TAO_IOR_MANIPULATION_H
 #include "ace/pre.h"
 
-#include "tao/Object.h"
+#include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORS.h"
+#include "tao/IORC.h"
 
-class TAO_Export TAO_IOR_Manipulation_impl : public POA_TAO_IOP::TAO_IOR_Manipulation
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_Export TAO_IOR_Manipulation_impl
+  : public TAO_IOP::TAO_IOR_Manipulation,
+    public CORBA::LocalObject
 {
 // = TITLE
   //     IOR Manipulation class
@@ -45,6 +54,12 @@ public:
   ~TAO_IOR_Manipulation_impl (void);
   // destructor
 
+  virtual void _add_ref (void);
+  // Increment the reference count.
+
+  virtual void _remove_ref (void);
+  // Decrement the reference count.
+
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
     CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
@@ -95,5 +110,9 @@ public:
       ));
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #include "ace/post.h"
 #endif /* TAO_IOR_MANIPULATION_H */
diff --git a/TAO/tao/IORS.cpp b/TAO/tao/IORS.cpp
deleted file mode 100644
index d5663c3edf2..00000000000
--- a/TAO/tao/IORS.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/IORS.h"
-
-ACE_RCSID(tao, IORS, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "tao/IORS.i"
-#endif /* !defined INLINE */
-
-POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-{
-}
-
-// copy ctor
-// POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs)
-//   :   TAO_Local_ServantBase (rhs)
-// {}
-//
-// skeleton destructor
-POA_TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-{
-}
-
-CORBA::Boolean POA_TAO_IOP::TAO_IOR_Manipulation::_is_a (
-    const char* value,
-    CORBA::Environment &
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_TAO_IOP::TAO_IOR_Manipulation::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0") == 0)
-    return ACE_static_cast (POA_TAO_IOP::TAO_IOR_Manipulation_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-
-TAO_IOP::TAO_IOR_Manipulation*
-POA_TAO_IOP::TAO_IOR_Manipulation::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  TAO_IOP::TAO_IOR_Manipulation *retval =
-    TAO_IOP::TAO_IOR_Manipulation::_nil ();
-
-  ACE_NEW_RETURN (retval,
-                  POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this,
-                                                                     stub),
-                  TAO_IOP::TAO_IOR_Manipulation::_nil ());
-
-  return retval;
-}
-
-void*
-POA_TAO_IOP::TAO_IOR_Manipulation::_create_collocated_objref (
-    const char* repository_id,
-    CORBA::ULong type,
-    TAO_Stub *stub)
-{
-  ACE_UNUSED_ARG (type);
-  if (!strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",repository_id))
-    {
-      TAO_IOP::TAO_IOR_Manipulation *retval =
-        TAO_IOP::TAO_IOR_Manipulation::_nil ();
-
-      ACE_NEW_RETURN (retval,
-                      POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this,
-                                                                         stub),
-                      TAO_IOP::TAO_IOR_Manipulation::_nil ());
-
-      return retval;
-    }
-  return 0;
-}
-
-POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_tao_collocated_TAO_IOR_Manipulation (
-    POA_TAO_IOP::TAO_IOR_Manipulation_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (TAO_IOP,TAO_IOR_Manipulation) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_TAO_IOP::TAO_IOR_Manipulation_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::merge_iors  (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->merge_iors (
-      iors,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::add_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->add_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::remove_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->remove_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::is_in_ior  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->is_in_ior (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::get_profile_count  (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-  return this->servant_->get_profile_count (
-      ior,
-      ACE_TRY_ENV
-    );
-
-}
diff --git a/TAO/tao/IORS.h b/TAO/tao/IORS.h
deleted file mode 100644
index 3fcdaa5a65c..00000000000
--- a/TAO/tao/IORS.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_IORS_H_
-#define _TAO_IDL_IORS_H_
-#include "ace/pre.h"
-
-#include "tao/IORC.h"
-#include "tao/Servant_Base.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_TAO_IOP
-{
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  class TAO_Export  TAO_IOR_Manipulation :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    TAO_IOR_Manipulation (void);
-
-  public:
-    virtual ~TAO_IOR_Manipulation (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    TAO_IOP::TAO_IOR_Manipulation *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual void* _create_collocated_objref(const char *repository_id,
-                                            CORBA::ULong type,
-                                            TAO_Stub *sobj);
-
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      )) = 0;
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs))
-  };
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_
-
-  class TAO_Export  _tao_collocated_TAO_IOR_Manipulation     : public virtual TAO_IOP::TAO_IOR_Manipulation
-  {
-  public:
-    _tao_collocated_TAO_IOR_Manipulation (
-        TAO_IOR_Manipulation_ptr  servant,
-        TAO_Stub *stub
-      );
-    TAO_IOR_Manipulation_ptr _get_servant (void) const;
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-
-
-  private:
-    TAO_IOR_Manipulation_ptr servant_;
-  };
-
-}
-TAO_NAMESPACE_CLOSE
-
-#endif /* end #if !defined */
-
-
-#if defined (__ACE_INLINE__)
-#include "tao/IORS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ifndef */
diff --git a/TAO/tao/IORS.i b/TAO/tao/IORS.i
deleted file mode 100644
index afa59bb09dc..00000000000
--- a/TAO/tao/IORS.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 973ef6c335b..4023d72dba2 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -59,7 +59,6 @@ PUB_HDRS = \
   Asynch_Reply_Dispatcher \
   DII_Reply_Dispatcher \
   IORC \
-  IORS \
   IORManipulation \
   BoundC \
   GIOPC
@@ -101,7 +100,6 @@ PLUGGABLE_PROTOCOLS_FILES = \
   SHMIOP_Acceptor \
   SHMIOP_Connect \
   IORC \
-  IORS \
   IORManipulation
 
 PLUGGABLE_MESSAGING_FILES = \
@@ -376,6 +374,12 @@ interceptor.target:
 	patch < diffs/InterceptorC.cpp.diff
 .PHONY interceptor.target:
 
+ior.target:
+	$(TAO_ROOT)/TAO_IDL/tao_idl -Ge 1 -Wb,export_macro=TAO_Export IOR.pidl; \
+	$(RM) -f IORS.* IORS_T.*; \
+	patch < diffs/IORC.h.diff
+.PHONY ior.target:
+
 ifeq ($(fakesvcconf),1)
   CPPFLAGS += -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP
 endif # fakesvcconf
@@ -626,10 +630,8 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -1029,10 +1031,8 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -1303,10 +1303,8 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -1542,10 +1540,8 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -2089,12 +2085,10 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -2336,12 +2330,10 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -2536,14 +2528,12 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -2827,10 +2817,8 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/GIOP_Server_Request.h \
@@ -3043,14 +3031,12 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -3298,14 +3284,12 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -3446,7 +3430,6 @@ realclean:
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -3464,7 +3447,6 @@ realclean:
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
@@ -3703,14 +3685,12 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -4115,7 +4095,6 @@ realclean:
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -4129,7 +4108,6 @@ realclean:
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -4400,7 +4378,6 @@ realclean:
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -4414,7 +4391,6 @@ realclean:
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
@@ -4626,7 +4602,6 @@ realclean:
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
@@ -4635,7 +4610,6 @@ realclean:
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
  $(TAO_ROOT)/tao/Interceptor.h \
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/InterceptorC.i \
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 1a9e6241cc5..934277a95af 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -520,9 +520,9 @@ CORBA_ORB::resolve_policy_current (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_ior_manipulation (CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::resolve_ior_manipulation (CORBA::Environment&)
 {
-  return this->ior_manipulation_._this (ACE_TRY_ENV);
+  return TAO_IOP::TAO_IOR_Manipulation::_duplicate (&this->ior_manipulation_);
 }
 
 CORBA_Object_ptr
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index ae63a7cd75b..8ddc88bac58 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -1563,25 +1563,6 @@ SOURCE=.\IORManipulation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Key_Adapters.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -3677,10 +3658,6 @@ SOURCE=.\IORManipulation.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Leader_Follower.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index e2596a5ef22..8f6a8ec6105 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -367,10 +367,6 @@ SOURCE=.\IORManipulation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Key_Adapters.cpp

 # End Source File

 # Begin Source File

@@ -1015,10 +1011,6 @@ SOURCE=.\IORManipulation.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Leader_Follower.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/diffs/IORC.cpp.diff b/TAO/tao/diffs/IORC.cpp.diff
deleted file mode 100644
index 152c761ab38..00000000000
--- a/TAO/tao/diffs/IORC.cpp.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- IORC.cpp	Mon Jun 26 19:59:10 2000
-+++ IORC.cpp	Mon Jun 26 18:27:41 2000
-@@ -1,4 +1,6 @@
--/* -*- C++ -*- $Id$ */
-+/* -*- C++ -*- */
-+// $Id$
-+
- 
- // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
- // TAO and the TAO IDL Compiler have been developed by the Center for
-@@ -7,12 +9,18 @@
- // Information about TAO is available at:
- //                 http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "IORC.h"
-+#include "tao/IORC.h"
- 
- #if !defined (__ACE_INLINE__)
--#include "IORC.i"
-+#include "tao/IORC.i"
- #endif /* !defined INLINE */
- 
-+#include "tao/IORS.h"
-+#include "tao/Stub.h"
-+#include "tao/Invocation.h"
-+#include "tao/NVList.h"
-+
-+ACE_RCSID(tao, IORC, "$Id$")
- 
- // default constructor
- TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
diff --git a/TAO/tao/diffs/IORC.h.diff b/TAO/tao/diffs/IORC.h.diff
index a5d58a06db2..5b3b6a36aed 100644
--- a/TAO/tao/diffs/IORC.h.diff
+++ b/TAO/tao/diffs/IORC.h.diff
@@ -1,41 +1,15 @@
---- IORC.h	Mon Jun 26 19:59:10 2000
-+++ IORC.h	Mon Jun 26 20:08:51 2000
-@@ -1,4 +1,5 @@
--/* -*- C++ -*- $Id$ */
-+/* -*- C++ -*- */
-+// $Id$
- 
- // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
- // TAO and the TAO IDL Compiler have been developed by the Center for
-@@ -9,8 +10,16 @@
- 
+--- IORC.h.orig	Thu Jul 06 20:33:05 2000
++++ IORC.h	Thu Jul 06 20:46:26 2000
+@@ -10,7 +10,11 @@
  #ifndef _TAO_IDL_IORC_H_
  #define _TAO_IDL_IORC_H_
-+#include "ace/pre.h"
  
 -#include "tao/corba.h"
-+#include "ace/OS.h"
 +#include "tao/corbafwd.h"
-+#include "tao/Environment.h"
-+#include "tao/CDR.h"
 +#include "tao/Object.h"
-+#include "tao/Sequence.h"
 +#include "tao/Exception.h"
-+#include "tao/Typecode.h"
++#include "tao/Environment.h"
++#include "tao/Sequence.h"
  
  #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
  #include "ace/streams.h"
-@@ -616,11 +625,12 @@
- 
- 
- #if defined (__ACE_INLINE__)
--#include "IORC.i"
-+#include "tao/IORC.i"
- #endif /* defined INLINE */
- 
- #if defined(_MSC_VER) && (_MSC_VER >= 1200)
- #pragma warning(pop)
- #endif /* _MSC_VER */
- 
-+#include "ace/post.h"
- #endif /* ifndef */