*** empty log message ***

11 files changed, 453 insertions, 688 deletions

diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index eb3cb254afa..8eb464031bd 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -25,151 +25,202 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IORManip_Loader.h"
-#include "tao/Typecode.h"
+#include "IORC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/Struct_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:295
-
-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,
-    0
-  );
+// be/be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_TAO_IOP_EmptyProfileList = 0;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_EmptyProfileList (
+    "IDL:TAO_IOP/EmptyProfileList:1.0",
+    "EmptyProfileList",
+    _tao_fields_TAO_IOP_EmptyProfileList,
+    0);
+  
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_EmptyProfileList =
+    &_tao_tc_TAO_IOP_EmptyProfileList;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_TAO_IOP_NotFound = 0;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_NotFound (
+    "IDL:TAO_IOP/NotFound:1.0",
+    "NotFound",
+    _tao_fields_TAO_IOP_NotFound,
+    0);
+  
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_NotFound =
+    &_tao_tc_TAO_IOP_NotFound;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_TAO_IOP_Duplicate = 0;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_Duplicate (
+    "IDL:TAO_IOP/Duplicate:1.0",
+    "Duplicate",
+    _tao_fields_TAO_IOP_Duplicate,
+    0);
+  
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Duplicate =
+    &_tao_tc_TAO_IOP_Duplicate;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_TAO_IOP_Invalid_IOR = 0;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_Invalid_IOR (
+    "IDL:TAO_IOP/Invalid_IOR:1.0",
+    "Invalid_IOR",
+    _tao_fields_TAO_IOP_Invalid_IOR,
+    0);
+  
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_Invalid_IOR =
+    &_tao_tc_TAO_IOP_Invalid_IOR;
+}
 
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/struct_typecode.cpp:34
+
+static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_TAO_IOP_MultiProfileList = 0;
+static TAO::TypeCode::Struct<char const *,
+                             TAO::TypeCode::Struct_Field<char const *> const *,
+                             CORBA::tk_except,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_MultiProfileList (
+    "IDL:TAO_IOP/MultiProfileList:1.0",
+    "MultiProfileList",
+    _tao_fields_TAO_IOP_MultiProfileList,
+    0);
+  
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr const _tc_MultiProfileList =
+    &_tao_tc_TAO_IOP_MultiProfileList;
+}
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_TAO_IOR_Property (
+    "IDL:TAO_IOP/TAO_IOR_Property:1.0",
+    "TAO_IOR_Property");
+  
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property =
-    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Property;
+    &_tao_tc_TAO_IOP_TAO_IOR_Property;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-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,
+// be/be_visitor_typecode/alias_typecode.cpp:31
+
 
-};
 
-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,
-    0
-  );
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:743
 
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+      TAO_IOP_TAO_IOR_Manipulation_IORList_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Object,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0 =
+      &TAO_IOP_TAO_IOR_Manipulation_IORList_0;
+    
+  }
+}
+
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
+    "IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0",
+    "IORList",
+    &TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0);
+  
 ::CORBA::TypeCode_ptr const TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
-  &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
+  &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-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,
-    0
-  );
-
+// be/be_visitor_typecode/objref_typecode.cpp:73
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_IOP_TAO_IOR_Manipulation (
+    "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",
+    "TAO_IOR_Manipulation");
+  
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation =
-    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation;
+    &_tao_tc_TAO_IOP_TAO_IOR_Manipulation;
 }
 
+
+
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// be/be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
     TAO_InputCDR & cdr
@@ -252,9 +303,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// be/be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
     TAO_InputCDR & cdr
@@ -337,9 +388,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// be/be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
     TAO_InputCDR & cdr
@@ -422,9 +473,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// be/be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
     TAO_InputCDR & cdr
@@ -507,9 +558,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// be/be_visitor_exception/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
     TAO_InputCDR & cdr
@@ -592,9 +643,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -604,14 +655,14 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
 {
@@ -661,9 +712,9 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -673,14 +724,14 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
   return 1;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
 {
   return false;
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template<>
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
 {
@@ -730,7 +781,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 
 
@@ -755,7 +806,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::insert_copy (
       _tao_any,
       TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-      TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
+      TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
       _tao_elem
     );
 }
@@ -769,7 +820,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::insert (
       _tao_any,
       TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-      TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
+      TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
       _tao_elem
     );
 }
@@ -796,7 +847,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::extract (
         _tao_any,
         TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-        TAO_IOP::TAO_IOR_Manipulation::_tc_IORList,
+        TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 8853393518c..f3cffe1f99a 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -26,12 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
-#include "IORManip_Loader.h"
+#include "IORC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -43,7 +48,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +57,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
   : CORBA::UserException (
@@ -151,52 +156,13 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
+CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_tao_type (void) const
 {
   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 const _tc_EmptyProfileList =
-    &_tc_TAO_tc_TAO_IOP_EmptyProfileList;
-}
-
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
   : CORBA::UserException (
@@ -295,48 +261,13 @@ void TAO_IOP::NotFound::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
+CORBA::TypeCode_ptr TAO_IOP::NotFound::_tao_type (void) const
 {
   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 const _tc_NotFound =
-    &_tc_TAO_tc_TAO_IOP_NotFound;
-}
-
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
   : CORBA::UserException (
@@ -435,48 +366,13 @@ void TAO_IOP::Duplicate::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
+CORBA::TypeCode_ptr TAO_IOP::Duplicate::_tao_type (void) const
 {
   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 const _tc_Duplicate =
-    &_tc_TAO_tc_TAO_IOP_Duplicate;
-}
-
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
   : CORBA::UserException (
@@ -575,48 +471,13 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
+CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_tao_type (void) const
 {
   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 const _tc_Invalid_IOR =
-    &_tc_TAO_tc_TAO_IOP_Invalid_IOR;
-}
-
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// be/be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
   : CORBA::UserException (
@@ -715,52 +576,13 @@ void TAO_IOP::MultiProfileList::_tao_decode (
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
+CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_tao_type (void) const
 {
   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 const _tc_MultiProfileList =
-    &_tc_TAO_tc_TAO_IOP_MultiProfileList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for TAO_IOP::TAO_IOR_Property.
 
@@ -901,7 +723,7 @@ TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for TAO_IOP::TAO_IOR_Manipulation.
 
@@ -937,7 +759,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
@@ -1095,7 +917,7 @@ TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// be/be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1115,7 +937,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// be/be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1135,7 +957,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// be/be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1155,7 +977,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// be/be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1175,7 +997,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// be/be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1195,7 +1017,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1619
+// be/be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 53eb59029a3..64e481517e0 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be/be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
@@ -40,10 +40,6 @@
 # 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"
@@ -76,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
+// be/be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -87,13 +83,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace TAO_IOP
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
@@ -130,20 +126,20 @@ namespace TAO_IOP
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be/be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EmptyProfileList;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
@@ -180,20 +176,20 @@ namespace TAO_IOP
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be/be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_NotFound;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
@@ -230,20 +226,20 @@ namespace TAO_IOP
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be/be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Duplicate;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
@@ -280,20 +276,20 @@ namespace TAO_IOP
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be/be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Invalid_IOR;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
@@ -330,20 +326,20 @@ namespace TAO_IOP
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // be/be_visitor_exception/exception_ch.cpp:127
     
-    virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MultiProfileList;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
@@ -366,7 +362,7 @@ namespace TAO_IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
@@ -401,7 +397,7 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean set_property (
         ::CORBA::Object_ptr & ior
@@ -413,7 +409,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean set_primary (
         ::CORBA::Object_ptr & ior1,
@@ -427,7 +423,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr get_primary (
         ::CORBA::Object_ptr ior
@@ -439,7 +435,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean is_primary_set (
         ::CORBA::Object_ptr ior
@@ -450,7 +446,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean remove_primary_tag (
         ::CORBA::Object_ptr & iogr
@@ -462,7 +458,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // be/be_visitor_interface/interface_ch.cpp:210
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -488,12 +484,12 @@ namespace TAO_IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be/be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
@@ -516,7 +512,7 @@ namespace TAO_IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
@@ -551,7 +547,7 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
+    // 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_
@@ -603,12 +599,12 @@ namespace TAO_IOP
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be/be_visitor_typecode/typecode_decl.cpp:44
     
     static ::CORBA::TypeCode_ptr const _tc_IORList;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr merge_iors (
         const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors
@@ -622,7 +618,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr add_profiles (
         ::CORBA::Object_ptr ior1,
@@ -637,7 +633,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr remove_profiles (
         ::CORBA::Object_ptr ior1,
@@ -652,7 +648,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean set_property (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
@@ -666,7 +662,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean set_primary (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
@@ -683,7 +679,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean remove_primary_tag (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
@@ -695,7 +691,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr get_primary (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
@@ -708,7 +704,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean is_primary_set (
         ::TAO_IOP::TAO_IOR_Property_ptr prop,
@@ -720,7 +716,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::ULong is_in_ior (
         ::CORBA::Object_ptr ior1,
@@ -733,7 +729,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // be/be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::ULong get_profile_count (
         ::CORBA::Object_ptr ior
@@ -745,7 +741,7 @@ namespace TAO_IOP
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // be/be_visitor_interface/interface_ch.cpp:210
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -771,17 +767,17 @@ namespace TAO_IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module TAO_IOP
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -831,7 +827,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// 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
@@ -839,7 +835,7 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Emp
 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
+// 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
@@ -847,7 +843,7 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Not
 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
+// 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
@@ -855,7 +851,7 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Dup
 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
+// 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
@@ -863,7 +859,7 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Inv
 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
+// 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
@@ -871,21 +867,21 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Mul
 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
+// 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
+// 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
+// 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
@@ -893,37 +889,37 @@ TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// be/be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::EmptyProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::EmptyProfileList &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// be/be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::NotFound &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::NotFound &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// be/be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Duplicate &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Duplicate &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// be/be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Invalid_IOR &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Invalid_IOR &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// be/be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::MultiProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "IORC.inl"
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index a7afd2a8bbe..076b495473e 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -26,59 +26,42 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Default_ORTC.h"
-#include "tao/Typecode.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Value_TypeCode.h"
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
-
-static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x44656661), 
-  ACE_NTOHL (0x756c745f), 
-  ACE_NTOHL (0x4f52542f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x6174653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
-    24,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-    0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate),
-    (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate,
-    0,
-    0
-  );
-
+// be/be_visitor_typecode/value_typecode.cpp:32
+
+static TAO::TypeCode::Value_Field<char const *>  * const _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate = 0;
+
+static TAO::TypeCode::Value<char const *,
+                            TAO::TypeCode::Value_Field<char const *> const *,
+                            CORBA::tk_value,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_TAO_Default_ORT_ObjectReferenceTemplate (
+    "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0",
+    "ObjectReferenceTemplate",
+    CORBA::VM_NONE,
+    &CORBA::_tc_null,
+    _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate,
+    0);
+  
 namespace TAO_Default_ORT
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
-    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate;
+    &_tao_tc_TAO_Default_ORT_ObjectReferenceTemplate;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
+// be/be_visitor_valuetype/any_op_cs.cpp:57
 
 template<>
 CORBA::Boolean
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index 4581f00f45b..61c1f98a2aa 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
 #include "Default_ORTC.h"
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be/be_visitor_valuetype/valuetype_cs.cpp:66
 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
@@ -151,7 +151,7 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+// be/be_visitor_valuetype/valuetype_obv_cs.cpp:58
 
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
@@ -172,7 +172,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_Ob
 }
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:488
+// be/be_valuetype.cpp:487
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
@@ -193,7 +193,7 @@ CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be/be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -219,7 +219,7 @@ operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/marshal_cs.cpp:44
+// be/be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &) const
@@ -238,7 +238,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1620
+// be/be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index dca192e206a..d3130d45a4b 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be/be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
@@ -72,13 +72,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace TAO_Default_ORT
 {
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:525
+  // be/be_valuetype.cpp:524
   
   
 
@@ -101,7 +101,7 @@ namespace TAO_Default_ORT
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be/be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
@@ -127,7 +127,7 @@ namespace TAO_Default_ORT
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
+    // be/be_visitor_valuetype/valuetype_ch.cpp:246
   
   protected:
     ObjectReferenceTemplate (void);
@@ -152,23 +152,23 @@ namespace TAO_Default_ORT
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module TAO_Default_ORT
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
+// be/be_visitor_valuetype/obv_module.cpp:55
 
 namespace OBV_TAO_Default_ORT
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
+  // be/be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
@@ -200,7 +200,7 @@ namespace OBV_TAO_Default_ORT
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -221,14 +221,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
+// be/be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:432
+// be/be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -237,13 +237,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be/be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.inl"
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.inl b/TAO/tao/ObjRefTemplate/Default_ORTC.inl
index 2b7e7fb7098..5f17e0441fb 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.inl
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
+// be/be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index bda01e9d169..956e389e811 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -25,196 +25,112 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectReferenceTemplate.h"
-#include "tao/Typecode.h"
+#include "ObjectReferenceTemplateC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Sequence_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Value_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:295
-
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
-    23,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
-    2, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
-    CORBA::tk_value,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceFactory),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceFactory,
-    0,
-    0
-  );
-
+// be/be_visitor_typecode/value_typecode.cpp:32
+
+static TAO::TypeCode::Value_Field<char const *>  * const _tao_fields_PortableInterceptor_ObjectReferenceFactory = 0;
+
+static TAO::TypeCode::Value<char const *,
+                            TAO::TypeCode::Value_Field<char const *> const *,
+                            CORBA::tk_value,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ObjectReferenceFactory (
+    "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0",
+    "ObjectReferenceFactory",
+    CORBA::VM_ABSTRACT,
+    &CORBA::_tc_null,
+    _tao_fields_PortableInterceptor_ObjectReferenceFactory,
+    0);
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory;
+    &_tao_tc_PortableInterceptor_ObjectReferenceFactory;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be/be_visitor_typecode/value_typecode.cpp:32
 
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x6174653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-    24,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-    2, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
+static TAO::TypeCode::Value_Field<char const *> _tao_fields_PortableInterceptor_ObjectReferenceTemplate[] =
+  {
+    
   };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceTemplate),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceTemplate,
-    0,
-    0
-  );
-
+static TAO::TypeCode::Value<char const *,
+                            TAO::TypeCode::Value_Field<char const *> const *,
+                            CORBA::tk_value,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ObjectReferenceTemplate (
+    "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0",
+    "ObjectReferenceTemplate",
+    CORBA::VM_ABSTRACT,
+    &CORBA::_tc_null,
+    _tao_fields_PortableInterceptor_ObjectReferenceTemplate,
+    3);
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate;
+    &_tao_tc_PortableInterceptor_ObjectReferenceTemplate;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:295
+// be/be_visitor_typecode/alias_typecode.cpp:31
 
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  63,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
-    27,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
-  ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
-    CORBA::tk_sequence, // typecode kind
-  124, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_value, // typecode kind
-    480, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      60,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x506f7274), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72636570), 
-      ACE_NTOHL (0x746f722f), 
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63745265), 
-      ACE_NTOHL (0x66657265), 
-      ACE_NTOHL (0x6e636554), 
-      ACE_NTOHL (0x656d706c), 
-      ACE_NTOHL (0x6174653a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-            24,
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63745265), 
-      ACE_NTOHL (0x66657265), 
-      ACE_NTOHL (0x6e636554), 
-      ACE_NTOHL (0x656d706c), 
-      ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-            2, // value modifier
-      CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-      
-    0U,
 
-};
 
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceTemplateSeq),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceTemplateSeq,
-    0,
-    0
-  );
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:743
+
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+      PortableInterceptor_ObjectReferenceTemplateSeq_0 (
+        CORBA::tk_sequence,
+        &PortableInterceptor::_tc_ObjectReferenceTemplate,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_PortableInterceptor_ObjectReferenceTemplateSeq_0 =
+      &PortableInterceptor_ObjectReferenceTemplateSeq_0;
+    
+  }
+}
 
+static TAO::TypeCode::Alias<char const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ObjectReferenceTemplateSeq (
+    "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0",
+    "ObjectReferenceTemplateSeq",
+    &TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0);
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq;
+    &_tao_tc_PortableInterceptor_ObjectReferenceTemplateSeq;
 }
 
+
+
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
+// be/be_visitor_valuetype/any_op_cs.cpp:57
 
 template<>
 CORBA::Boolean
@@ -270,7 +186,7 @@ operator>>= (
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
+// be/be_visitor_valuetype/any_op_cs.cpp:57
 
 template<>
 CORBA::Boolean
@@ -326,7 +242,7 @@ operator>>= (
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -337,7 +253,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert_copy (
       _tao_any,
       PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
       _tao_elem
     );
 }
@@ -351,7 +267,7 @@ void operator<<= (
   TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert (
       _tao_any,
       PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
       _tao_elem
     );
 }
@@ -378,7 +294,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::extract (
         _tao_any,
         PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+        TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
         _tao_elem
       );
 }
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index f6c962047ef..f2ff2beffe6 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be/be_codegen.cpp:302
 
 
-#include "ObjectReferenceTemplate.h"
+#include "ObjectReferenceTemplateC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -48,14 +48,14 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be/be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be/be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
@@ -76,7 +76,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be/be_visitor_valuetype/valuetype_cs.cpp:66
 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
@@ -166,7 +166,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be/be_visitor_valuetype/valuetype_cs.cpp:66
 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
@@ -256,7 +256,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
@@ -312,7 +312,7 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:488
+// be/be_valuetype.cpp:487
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -333,7 +333,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be/be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -361,7 +361,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:488
+// be/be_valuetype.cpp:487
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -382,7 +382,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be/be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -410,7 +410,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be/be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
@@ -482,7 +482,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1620
+// be/be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index 7467bbd38d9..ccf8da3e3c5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -26,16 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be/be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include /**/ "ace/pre.h"
 
-#ifndef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
-#error "You should not include ObjectReferenceTemplateC.h directly, use ObjectReferenceTemplate.h"
-#endif /* !TAO_OBJREF_TEMPLATE_SAFE_INCLUDE */
 
 #include "ace/config-all.h"
 
@@ -80,13 +77,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:525
+  // be/be_valuetype.cpp:524
   
   
 
@@ -109,7 +106,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be/be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
@@ -135,7 +132,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
+    // be/be_visitor_valuetype/valuetype_ch.cpp:404
     
   public:
     virtual CORBA::Object_ptr make_object (
@@ -143,7 +140,7 @@ namespace PortableInterceptor
       ) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
+    // be/be_visitor_valuetype/valuetype_ch.cpp:246
   
   protected:
     ObjectReferenceFactory (void);
@@ -160,12 +157,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory;
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:525
+  // be/be_valuetype.cpp:524
   
   
 
@@ -188,7 +185,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be/be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
@@ -214,7 +211,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
+    // be/be_visitor_valuetype/valuetype_ch.cpp:404
     
   public:
     virtual char * server_id (
@@ -222,7 +219,7 @@ namespace PortableInterceptor
       ) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
+    // be/be_visitor_valuetype/valuetype_ch.cpp:404
     
   public:
     virtual char * orb_id (
@@ -230,7 +227,7 @@ namespace PortableInterceptor
       ) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
+    // be/be_visitor_valuetype/valuetype_ch.cpp:404
     
   public:
     virtual ::PortableInterceptor::AdapterName * adapter_name (
@@ -238,7 +235,7 @@ namespace PortableInterceptor
       ) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
+    // be/be_visitor_valuetype/valuetype_ch.cpp:246
   
   protected:
     ObjectReferenceTemplate (void);
@@ -255,12 +252,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
@@ -315,24 +312,24 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
+// be/be_visitor_valuetype/obv_module.cpp:55
 
 namespace OBV_PortableInterceptor
 {
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -366,21 +363,21 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
+// be/be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
+// be/be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
@@ -388,7 +385,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercept
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:432
+// be/be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -397,13 +394,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be/be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:432
+// be/be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -412,13 +409,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be/be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be/be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
@@ -435,7 +432,7 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be/be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.inl"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
index c900a647347..eaea7d71bda 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
+// be/be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
@@ -44,7 +44,7 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
+// be/be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)