ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 573 insertions, 640 deletions

diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 8b1daf136d4..a67b1945f02 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,196 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
-#include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_EmptyProfileList =
-    &_tc_TAO_tc_TAO_IOP_EmptyProfileList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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
-  };
-
-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_typecode/typecode_defn.cpp:290
-
-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)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Duplicate =
-    &_tc_TAO_tc_TAO_IOP_Duplicate;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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
-  };
-
-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_typecode/typecode_defn.cpp:290
-
-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_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Property[] =
 {
@@ -243,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Property (
     sizeof (_oc_TAO_IOP_TAO_IOR_Property),
     (char *) &_oc_TAO_IOP_TAO_IOR_Property,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Property)
+    0
   );
 
 namespace TAO_IOP
@@ -253,7 +71,7 @@ namespace TAO_IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
 {
@@ -302,14 +120,14 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
     sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList),
     (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList)
+    0
   );
 
 ::CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
   &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
 {
@@ -339,7 +157,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (
     sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation),
     (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Manipulation)
+    0
   );
 
 namespace TAO_IOP
@@ -359,9 +177,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -371,11 +189,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -412,8 +230,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::EmptyProfileList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::EmptyProfileList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::EmptyProfileList *&> (
       _tao_elem
     );
 }
@@ -444,9 +262,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -456,11 +274,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -497,8 +315,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::NotFound *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::NotFound *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::NotFound *&> (
       _tao_elem
     );
 }
@@ -529,9 +347,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -541,11 +359,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -582,8 +400,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::Duplicate *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::Duplicate *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::Duplicate *&> (
       _tao_elem
     );
 }
@@ -614,9 +432,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -626,11 +444,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -667,8 +485,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::Invalid_IOR *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::Invalid_IOR *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::Invalid_IOR *&> (
       _tao_elem
     );
 }
@@ -688,7 +506,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -698,12 +516,12 @@ TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
-  if ((cdr >> id.out ()) == 0)
+  
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -711,11 +529,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
-
-  return 1;
+  
+  return true;
 }
 
 // Copying insertion.
@@ -752,8 +570,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::MultiProfileList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::MultiProfileList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::MultiProfileList *&> (
       _tao_elem
     );
 }
@@ -790,14 +608,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -859,14 +677,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -911,7 +729,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -920,14 +738,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -962,8 +780,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::TAO_IOR_Manipulation::IORList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::TAO_IOR_Manipulation::IORList *&> (
       _tao_elem
     );
 }
@@ -983,8 +801,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -1069,5 +885,4 @@ CORBA::Boolean operator>>= (
         TAO_IOP::TAO_IOR_Manipulation \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index d579c25af93..16e113bf9f9 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IORManip_Loader.h"
@@ -39,11 +39,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IORC.i"
+#include "IORC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -84,21 +84,20 @@ TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_ex
 void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmptyProfileList *_tao_tmp_pointer =
-    ACE_static_cast (EmptyProfileList*, _tao_void_pointer);
+    static_cast<EmptyProfileList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::EmptyProfileList *
 TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (EmptyProfileList *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<EmptyProfileList *> (_tao_excp);
+}
+
+const TAO_IOP::EmptyProfileList *
+TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const EmptyProfileList *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
@@ -154,15 +153,49 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_EmptyProfileList;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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,
+    0
+  );
+
+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)
@@ -195,21 +228,20 @@ TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   NotFound *_tao_tmp_pointer =
-    ACE_static_cast (NotFound*, _tao_void_pointer);
+    static_cast<NotFound *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::NotFound *
 TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NotFound *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NotFound *> (_tao_excp);
+}
+
+const TAO_IOP::NotFound *
+TAO_IOP::NotFound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NotFound *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
@@ -245,7 +277,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -258,22 +290,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
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_NotFound;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_NotFound),
+    (char *) &_oc_TAO_IOP_NotFound,
+    0,
+    0
+  );
+
+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)
@@ -306,21 +368,20 @@ TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
 {
   Duplicate *_tao_tmp_pointer =
-    ACE_static_cast (Duplicate*, _tao_void_pointer);
+    static_cast<Duplicate *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::Duplicate *
 TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (Duplicate *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<Duplicate *> (_tao_excp);
+}
+
+const TAO_IOP::Duplicate *
+TAO_IOP::Duplicate::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const Duplicate *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
@@ -356,7 +417,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -369,22 +430,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
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_Duplicate;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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,
+    0
+  );
+
+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)
@@ -417,21 +508,20 @@ TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 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);
+    static_cast<Invalid_IOR *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::Invalid_IOR *
 TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (Invalid_IOR *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<Invalid_IOR *> (_tao_excp);
+}
+
+const TAO_IOP::Invalid_IOR *
+TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const Invalid_IOR *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
@@ -467,7 +557,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -480,22 +570,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
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_Invalid_IOR;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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
+  };
+
+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,
+    0
+  );
+
+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)
@@ -528,21 +648,20 @@ TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_ex
 void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
 {
   MultiProfileList *_tao_tmp_pointer =
-    ACE_static_cast (MultiProfileList*, _tao_void_pointer);
+    static_cast<MultiProfileList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::MultiProfileList *
 TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (MultiProfileList *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<MultiProfileList *> (_tao_excp);
+}
+
+const TAO_IOP::MultiProfileList *
+TAO_IOP::MultiProfileList::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const MultiProfileList *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
@@ -578,7 +697,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -591,22 +710,56 @@ 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
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_MultiProfileList;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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,
+    0
+  );
+
+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
 
 // Traits specializations for TAO_IOP::TAO_IOR_Property.
@@ -646,23 +799,17 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*TAO_IOP__TAO_TAO_IOR_Property_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
 
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-void
+void 
 TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Property *_tao_tmp_pointer =
-    ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
+    static_cast<TAO_IOR_Property *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -676,10 +823,10 @@ TAO_IOP::TAO_IOR_Property::_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-
+  
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
@@ -693,10 +840,10 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-
+  
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
@@ -707,7 +854,7 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -719,18 +866,18 @@ TAO_IOP::TAO_IOR_Property::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:TAO_IOP/TAO_IOR_Property:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -791,13 +938,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-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:65
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
@@ -844,7 +985,7 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (
   )
 {
   IORList * _tao_tmp_pointer =
-    ACE_static_cast (IORList *, _tao_void_pointer);
+    static_cast<IORList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -856,11 +997,11 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void
+void 
 TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Manipulation *_tao_tmp_pointer =
-    ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
+    static_cast<TAO_IOR_Manipulation *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -874,10 +1015,10 @@ TAO_IOP::TAO_IOR_Manipulation::_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-
+  
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
@@ -891,10 +1032,10 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-
+  
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
@@ -905,7 +1046,7 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -917,18 +1058,18 @@ TAO_IOP::TAO_IOR_Manipulation::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -957,15 +1098,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::EmptyProfileList &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -973,7 +1107,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::EmptyProfileList&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -984,15 +1118,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::NotFound &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1000,7 +1127,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::NotFound&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1011,15 +1138,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::Duplicate &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1027,7 +1147,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::Duplicate&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1038,15 +1158,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::Invalid_IOR &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1054,7 +1167,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::Invalid_IOR&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1065,15 +1178,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::MultiProfileList &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1081,11 +1187,11 @@ CORBA::Boolean operator>> (
     TAO_IOP::MultiProfileList&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -1098,7 +1204,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO_IOP::TAO_IOR_Property
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Property
@@ -1143,7 +1249,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO_IOP::TAO_IOR_Manipulation
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Manipulation
@@ -1160,7 +1266,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO_IOP::TAO_IOR_Property
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Property
@@ -1200,10 +1306,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO_IOP::TAO_IOR_Manipulation
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Manipulation
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 6ff36e7447c..6cb934fd772 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -26,24 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
 
-#ifndef TAO_IORMANIP_SAFE_INCLUDE
-#error "You should not include IORC.h directly, use IORManip_Loader.h"
-#endif /* !TAO_IORMANIP_SAFE_INCLUDE */
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ #ifndef TAO_IORMANIP_SAFE_INCLUDE
+ #error "You should not include IORC.h directly, use IORManip_Loader.h"
+ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
+
 #include "ior_manip_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -64,9 +67,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +76,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -110,6 +111,8 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
 
     static EmptyProfileList *_downcast (CORBA::Exception *);
+    static const EmptyProfileList *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -127,7 +130,7 @@ namespace TAO_IOP
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -158,6 +161,8 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
 
     static NotFound *_downcast (CORBA::Exception *);
+    static const NotFound *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -175,7 +180,7 @@ namespace TAO_IOP
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -202,12 +207,14 @@ namespace TAO_IOP
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Duplicate *_downcast (CORBA::Exception *);
+    static const Duplicate *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -216,46 +223,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     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
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-
+  
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-
+    
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
+    static const Invalid_IOR *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -264,46 +273,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     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
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-
+    
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
+    static const MultiProfileList *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -312,40 +323,40 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     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
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
-
+  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Property
       >
     TAO_IOR_Property_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Property
@@ -353,147 +364,147 @@ namespace TAO_IOP
     TAO_IOR_Property_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-
+    
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _nil (void)
     {
-      return (TAO_IOR_Property_ptr)0;
+      return static_cast<TAO_IOR_Property_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
-        CORBA::Object_ptr & ior
+        ::CORBA::Object_ptr & ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
-        CORBA::Object_ptr & ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr & ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Duplicate
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
-        CORBA::Object_ptr & iogr
+        ::CORBA::Object_ptr & iogr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TAO_IOR_Property (void);
-
+    
     virtual ~TAO_IOR_Property (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Property (const TAO_IOR_Property &);
-
+    
     void operator= (const TAO_IOR_Property &);
   };
 
 #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:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
-
+  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Manipulation
       >
     TAO_IOR_Manipulation_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Manipulation
@@ -501,48 +512,48 @@ namespace TAO_IOP
     TAO_IOR_Manipulation_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-
+    
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _nil (void)
     {
-      return (TAO_IOR_Manipulation_ptr)0;
+      return static_cast<TAO_IOR_Manipulation_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
+    
     class IORList;
-
+    
     typedef
       TAO_MngSeq_Var_T<
           IORList,
@@ -551,7 +562,7 @@ namespace TAO_IOP
             >
         >
       IORList_var;
-
+    
     typedef
       TAO_MngSeq_Out_T<
           IORList,
@@ -561,7 +572,7 @@ namespace TAO_IOP
             >
         >
       IORList_out;
-
+    
     class TAO_IORManip_Export IORList
       : public
           TAO_Unbounded_Pseudo_Sequence<
@@ -574,190 +585,190 @@ namespace TAO_IOP
       IORList (
           CORBA::ULong max,
           CORBA::ULong length,
-          CORBA::Object_ptr* buffer,
+          CORBA::Object_ptr* buffer, 
           CORBA::Boolean release = 0
         );
       IORList (const IORList &);
       ~IORList (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef IORList_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // 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 (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
+        const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::Duplicate
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::Duplicate
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::Duplicate
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::Duplicate
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::Duplicate
-        , TAO_IOP::MultiProfileList
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::MultiProfileList,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TAO_IOR_Manipulation (void);
-
+    
     virtual ~TAO_IOR_Manipulation (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-
+    
     void operator= (const TAO_IOR_Manipulation &);
   };
 
 #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
@@ -774,19 +785,19 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Property>
+  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Property>
   {
-    static TAO_IOP::TAO_IOR_Property_ptr duplicate (
-        TAO_IOP::TAO_IOR_Property_ptr
+    static ::TAO_IOP::TAO_IOR_Property_ptr duplicate (
+        ::TAO_IOP::TAO_IOR_Property_ptr
       );
     static void release (
-        TAO_IOP::TAO_IOR_Property_ptr
+        ::TAO_IOP::TAO_IOR_Property_ptr
       );
-    static TAO_IOP::TAO_IOR_Property_ptr nil (void);
+    static ::TAO_IOP::TAO_IOR_Property_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO_IOP::TAO_IOR_Property_ptr p,
+        ::TAO_IOP::TAO_IOR_Property_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -795,19 +806,19 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>
+  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Manipulation>
   {
-    static TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
-        TAO_IOP::TAO_IOR_Manipulation_ptr
+    static ::TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr
       );
     static void release (
-        TAO_IOP::TAO_IOR_Manipulation_ptr
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr
       );
-    static TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
+    static ::TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO_IOP::TAO_IOR_Manipulation_ptr p,
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -908,13 +919,13 @@ TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::M
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IORC.i"
+#include "IORC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -925,3 +936,5 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IORManipulation/diffs/IOR.diff b/TAO/tao/IORManipulation/diffs/IOR.diff
index 9a7bf0ac79b..6c302a23cf8 100644
--- a/TAO/tao/IORManipulation/diffs/IOR.diff
+++ b/TAO/tao/IORManipulation/diffs/IOR.diff
@@ -1,35 +1,35 @@
---- orig/IORC.h	Wed Feb  6 13:29:21 2002
-+++ IORC.h	Wed Feb  6 13:30:34 2002
-@@ -23,13 +23,20 @@
- #define _TAO_IDL_ORIG_IORC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+
-+#ifndef TAO_IORMANIP_SAFE_INCLUDE
-+#error "You should not include IORC.h directly, use IORManip_Loader.h"
-+#endif /* !TAO_IORMANIP_SAFE_INCLUDE */
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
+--- orig/IORC.h	2005-02-14 14:33:17.541928300 +0100
++++ IORC.h	2005-02-14 14:35:33.857941100 +0100
+@@ -40,6 +40,10 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
++ #ifndef TAO_IORMANIP_SAFE_INCLUDE
++ #error "You should not include IORC.h directly, use IORManip_Loader.h"
++ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
++
  #include "ior_manip_export.h"
-+#include "tao/Exception.h"
-+#include "tao/Object.h"
-+#include "tao/Sequence.h"
+ #include "tao/ORB.h"
+ #include "tao/SystemException.h"
+--- orig/IORC.cpp	2005-02-14 14:33:17.541928300 +0100
++++ IORC.cpp	2005-02-14 14:33:48.095862700 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
  
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
---- orig/IORC.cpp	Wed Feb  6 13:29:21 2002
-+++ IORC.cpp	Wed Feb  6 13:30:56 2002
-@@ -19,7 +19,7 @@
+ 
+-#include "IORC.h"
++#include "IORManip_Loader.h"
+ #include "tao/CDR.h"
+ #include "tao/Typecode.h"
+ #include "ace/OS_NS_string.h"
+--- orig/IORA.cpp	2005-02-14 14:33:17.541928300 +0100
++++ IORA.cpp	2005-02-14 14:38:14.699219500 +0100
+@@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "IORC.h"
 +#include "IORManip_Loader.h"
- 
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"