ChangeLogTag:Wed Sep 3 11:41:31 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>refactor-stage_5

5 files changed, 1222 insertions, 53 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 10be37a1364..3b4e9431a70 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,11 @@
+Wed Sep  3 11:41:31 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/IORManipulation/IORC.cpp: 
+	* tao/IORManipulation/IORC.h:
+	* tao/IORManipulation/IORC.i: Regenerated the code. 
+	
+	* tao/PortableServer/PolicyS.h: Fixed a compile error on g++.
+
 Tue Sep  2 20:39:57 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAOACE.dsw:
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index b22bfab6116..77677767299 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -33,6 +33,8 @@
 #include "tao/Stub.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -55,7 +57,7 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_CS_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_CS_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_IORManip_Export Arg_Traits<TAO_IOP::TAO_IOR_Property>
     : public
@@ -69,13 +71,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_arg_traits.cpp:262
 
 #if !defined (__TAO_SEQ_CORBA_OBJECT___ARG_TRAITS_CS_)
 #define __TAO_SEQ_CORBA_OBJECT___ARG_TRAITS_CS_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_IORManip_Export Arg_Traits<TAO_IOP::TAO_IOR_Manipulation::IORList>
     : public
@@ -90,7 +92,7 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
@@ -120,6 +122,13 @@ TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_ex
   return *this;
 }
 
+void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
+{
+  EmptyProfileList *_tao_tmp_pointer =
+    ACE_static_cast (EmptyProfileList*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 TAO_IOP::EmptyProfileList *
 TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -166,7 +175,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -179,13 +188,56 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_EmptyProfileList;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/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_EmptyProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_EmptyProfileList),
+    (char *) &_oc_TAO_IOP_EmptyProfileList,
+    0,
+    sizeof (TAO_IOP::EmptyProfileList)
+  );
 
-// TAO_IDL - Generated from 
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_EmptyProfileList =
+    &_tc_TAO_tc_TAO_IOP_EmptyProfileList;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
@@ -215,6 +267,13 @@ TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
   return *this;
 }
 
+void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NotFound *_tao_tmp_pointer =
+    ACE_static_cast (NotFound*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 TAO_IOP::NotFound *
 TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -261,7 +320,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -274,13 +333,52 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
+{
+  return ::TAO_IOP::_tc_NotFound;
+}
 
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_NotFound[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  25,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
+    9,
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x0),  // name = NotFound
+  0, // member count
+  };
 
-// TAO_IDL - Generated from 
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_NotFound),
+    (char *) &_oc_TAO_IOP_NotFound,
+    0,
+    sizeof (TAO_IOP::NotFound)
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_NotFound =
+    &_tc_TAO_tc_TAO_IOP_NotFound;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
@@ -310,6 +408,13 @@ TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
   return *this;
 }
 
+void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Duplicate *_tao_tmp_pointer =
+    ACE_static_cast (Duplicate*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 TAO_IOP::Duplicate *
 TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -356,7 +461,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -369,13 +474,52 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
+{
+  return ::TAO_IOP::_tc_Duplicate;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/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_Duplicate (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Duplicate),
+    (char *) &_oc_TAO_IOP_Duplicate,
+    0,
+    sizeof (TAO_IOP::Duplicate)
+  );
 
-// TAO_IDL - Generated from 
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Duplicate =
+    &_tc_TAO_tc_TAO_IOP_Duplicate;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
@@ -405,6 +549,13 @@ TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
   return *this;
 }
 
+void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Invalid_IOR *_tao_tmp_pointer =
+    ACE_static_cast (Invalid_IOR*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 TAO_IOP::Invalid_IOR *
 TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -451,7 +602,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -464,13 +615,52 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
+{
+  return ::TAO_IOP::_tc_Invalid_IOR;
+}
 
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  28,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
+  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
+    12,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
+  ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
+  0, // member count
+  };
 
-// TAO_IDL - Generated from 
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Invalid_IOR),
+    (char *) &_oc_TAO_IOP_Invalid_IOR,
+    0,
+    sizeof (TAO_IOP::Invalid_IOR)
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Invalid_IOR =
+    &_tc_TAO_tc_TAO_IOP_Invalid_IOR;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
@@ -500,6 +690,13 @@ TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_ex
   return *this;
 }
 
+void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
+{
+  MultiProfileList *_tao_tmp_pointer =
+    ACE_static_cast (MultiProfileList*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 TAO_IOP::MultiProfileList *
 TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
@@ -546,7 +743,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -559,11 +756,54 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_MultiProfileList;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
+    17,
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x0),  // name = MultiProfileList
+  0, // member count
+  };
 
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_MultiProfileList),
+    (char *) &_oc_TAO_IOP_MultiProfileList,
+    0,
+    sizeof (TAO_IOP::MultiProfileList)
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_MultiProfileList =
+    &_tc_TAO_tc_TAO_IOP_MultiProfileList;
+}
 
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
@@ -602,7 +842,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*TAO_IOP__TAO_TAO_IOR_Property_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -613,16 +853,29 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
+void
+TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_IOR_Property *_tao_tmp_pointer =
+    ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
 TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property::_narrow (
     CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return TAO_IOR_Property::_nil ();
+    }
+
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-  proxy->_add_ref ();
-  return proxy;
+
+  return TAO_IOR_Property::_duplicate (proxy);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
@@ -632,7 +885,7 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -677,6 +930,44 @@ TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Property[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727479),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Property:1.0
+    17,
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727479),
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Property
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Property (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Property),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Property,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Property)
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property =
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Property;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for TAO_IOP::TAO_IOR_Manipulation.
@@ -713,12 +1004,12 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*TAO_IOP__TAO_TAO_IOR_Manipulation_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
@@ -760,24 +1051,102 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void)
 {}
 
+void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  IORList * _tao_tmp_pointer =
+    ACE_static_cast (IORList *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x2f494f52),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
+    8,
+  ACE_NTOHL (0x494f524c),
+  ACE_NTOHL (0x69737400),  // name = IORList
+    CORBA::tk_sequence, // typecode kind
+  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;
+
 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 *_tao_void_pointer)
+{
+  TAO_IOR_Manipulation *_tao_tmp_pointer =
+    ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
 TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return TAO_IOR_Manipulation::_nil ();
+    }
+
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-  proxy->_add_ref ();
-  return proxy;
+
+  return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -787,7 +1156,7 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -832,10 +1201,638 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
+    21,
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Manipulation)
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation =
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::EmptyProfileList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
+      TAO_IOP::_tc_EmptyProfileList,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
+      TAO_IOP::_tc_EmptyProfileList,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::EmptyProfileList *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::EmptyProfileList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::extract (
+        _tao_any,
+        TAO_IOP::EmptyProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_EmptyProfileList,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert_copy (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
+      TAO_IOP::_tc_NotFound,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
+      TAO_IOP::_tc_NotFound,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::NotFound *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::extract (
+        _tao_any,
+        TAO_IOP::NotFound::_tao_any_destructor,
+        TAO_IOP::_tc_NotFound,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert_copy (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
+      TAO_IOP::_tc_Duplicate,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
+      TAO_IOP::_tc_Duplicate,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Duplicate *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::extract (
+        _tao_any,
+        TAO_IOP::Duplicate::_tao_any_destructor,
+        TAO_IOP::_tc_Duplicate,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert_copy (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
+      TAO_IOP::_tc_Invalid_IOR,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
+      TAO_IOP::_tc_Invalid_IOR,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Invalid_IOR *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::extract (
+        _tao_any,
+        TAO_IOP::Invalid_IOR::_tao_any_destructor,
+        TAO_IOP::_tc_Invalid_IOR,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
+      TAO_IOP::_tc_MultiProfileList,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
+      TAO_IOP::_tc_MultiProfileList,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::MultiProfileList *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::extract (
+        _tao_any,
+        TAO_IOP::MultiProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_MultiProfileList,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_cs.cpp:50
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Property_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Property::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Property,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Property,
+        _tao_elem
+      );
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_cs.cpp:50
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Manipulation,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Manipulation,
+        _tao_elem
+      );
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // be/be_visitor_root/root.cpp:1703
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+  template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::EmptyProfileList
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::NotFound
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::Duplicate
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::Invalid_IOR
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::MultiProfileList
+      >;
+
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_TMPLINST_CS_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_TMPLINST_CS_
 
@@ -855,13 +1852,18 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
         TAO_IOP::TAO_IOR_Property,
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Property,
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>
       >;
 
+  template class
+    TAO::Any_Impl_T<
+        TAO_IOP::TAO_IOR_Property
+      >;
+
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST__ARG_TRAITS_TMPLINST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST__ARG_TRAITS_TMPLINST_CS_
 
@@ -907,6 +1909,11 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
       >;
 
   template class
+    TAO::Any_Dual_Impl_T<
+        TAO_IOP::TAO_IOR_Manipulation::IORList
+      >;
+
+  template class
     TAO::In_Var_Size_Argument_T<
         TAO_IOP::TAO_IOR_Manipulation::IORList
       >;
@@ -921,15 +1928,45 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
         TAO_IOP::TAO_IOR_Manipulation,
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Manipulation,
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>
       >;
 
+  template class
+    TAO::Any_Impl_T<
+        TAO_IOP::TAO_IOR_Manipulation
+      >;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::EmptyProfileList \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::NotFound \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::Duplicate \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::Invalid_IOR \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::MultiProfileList \
+      >
+
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_TMPLINST_CS_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__ARG_TRAITS_TMPLINST_CS_
 
@@ -949,13 +1986,18 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
         TAO_IOP::TAO_IOR_Property, \
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property> \
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Property, \
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property> \
       >
 
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO_IOP::TAO_IOR_Property \
+      >
+
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST__ARG_TRAITS_TMPLINST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST__ARG_TRAITS_TMPLINST_CS_
 
@@ -996,6 +2038,11 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
       >
 
 # pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        TAO_IOP::TAO_IOR_Manipulation::IORList \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         TAO_IOP::TAO_IOR_Manipulation::IORList \
       >
@@ -1010,12 +2057,16 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
         TAO_IOP::TAO_IOR_Manipulation, \
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation> \
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Manipulation, \
         TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation> \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO_IOP::TAO_IOR_Manipulation \
+      >
 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 39b7b9a08b4..0152be4c283 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -30,6 +30,7 @@
 
 #ifndef _TAO_IDL_ORIG_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
+
 #include /**/ "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -80,6 +81,8 @@
 namespace TAO
 {
   class Collocation_Proxy_Broker;
+
+  template<typename T> class Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
@@ -104,6 +107,8 @@ namespace TAO_IOP
 
     EmptyProfileList &operator= (const EmptyProfileList &);
 
+    static void _tao_any_destructor (void *);
+
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -123,8 +128,15 @@ namespace TAO_IOP
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:125
+
+    virtual CORBA::TypeCode_ptr _type (void) const;
   };
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
+
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
@@ -143,6 +155,8 @@ namespace TAO_IOP
 
     NotFound &operator= (const NotFound &);
 
+    static void _tao_any_destructor (void *);
+
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -162,8 +176,15 @@ namespace TAO_IOP
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:125
+
+    virtual CORBA::TypeCode_ptr _type (void) const;
   };
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
+
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
@@ -182,6 +203,8 @@ namespace TAO_IOP
 
     Duplicate &operator= (const Duplicate &);
 
+    static void _tao_any_destructor (void *);
+
     static Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -201,8 +224,15 @@ namespace TAO_IOP
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:125
+
+    virtual CORBA::TypeCode_ptr _type (void) const;
   };
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
+
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
@@ -221,6 +251,8 @@ namespace TAO_IOP
 
     Invalid_IOR &operator= (const Invalid_IOR &);
 
+    static void _tao_any_destructor (void *);
+
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -240,8 +272,15 @@ namespace TAO_IOP
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:125
+
+    virtual CORBA::TypeCode_ptr _type (void) const;
   };
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
+
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
@@ -260,6 +299,8 @@ namespace TAO_IOP
 
     MultiProfileList &operator= (const MultiProfileList &);
 
+    static void _tao_any_destructor (void *);
+
     static MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -279,8 +320,15 @@ namespace TAO_IOP
 
     // TAO_IDL - Generated from
     // be/be_visitor_exception/exception_ch.cpp:125
+
+    virtual CORBA::TypeCode_ptr _type (void) const;
   };
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
+
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
@@ -332,7 +380,7 @@ namespace TAO_IOP
         return (TAO_IOR_Property_ptr)0;
       }
 
-
+    static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
@@ -406,6 +454,11 @@ namespace TAO_IOP
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property;
+
+  // TAO_IDL - Generated from
   // be/be_interface.cpp:601
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
@@ -454,7 +507,7 @@ namespace TAO_IOP
         return (TAO_IOR_Manipulation_ptr)0;
       }
 
-
+    static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
     // be/be_visitor_sequence/sequence_ch.cpp:101
@@ -501,12 +554,19 @@ namespace TAO_IOP
       IORList (const IORList &);
       ~IORList (void);
 
+      static void _tao_any_destructor (void *);
+
       typedef IORList_var _var_type;
     };
 
 #endif /* end #if !defined */
 
     // TAO_IDL - Generated from
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+
+    static ::CORBA::TypeCode_ptr _tc_IORList;
+
+    // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr merge_iors (
@@ -653,6 +713,11 @@ namespace TAO_IOP
 
 #endif /* end #if !defined */
 
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
+
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
 
@@ -667,6 +732,68 @@ namespace TAO
 };
 
 // TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::EmptyProfileList &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::EmptyProfileList*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::EmptyProfileList *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::EmptyProfileList *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::NotFound &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::NotFound*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::NotFound *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::NotFound *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Duplicate &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Duplicate*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Duplicate *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Duplicate *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Invalid_IOR &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Invalid_IOR*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Invalid_IOR *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Invalid_IOR *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_exception/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::MultiProfileList &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::MultiProfileList*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::MultiProfileList *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::MultiProfileList *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr &);
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
+
+// TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
@@ -707,7 +834,7 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:969
+// be/be_codegen.cpp:926
 
 #if defined (__ACE_INLINE__)
 #include "IORC.i"
@@ -721,5 +848,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #pragma option pop
 #endif /* __BORLANDC__ */
 
-#include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index a42c041a68f..080685e39e2 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -27,22 +27,6 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___CI_
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___CI_
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
 // be/be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 97b34e25de1..b2b02a95288 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -32,7 +32,7 @@
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include /**/ "ace/pre.h"
-#include "PolicyC.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once