ChangeLogTag: Thu Mar 31 09:53:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 81 insertions, 92 deletions

diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index 076b495473e..a714474a375 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -36,9 +36,9 @@
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:32
+// 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_Field<char const *> const * const _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate = 0;
 
 static TAO::TypeCode::Value<char const *,
                             TAO::TypeCode::Value_Field<char const *> const *,
@@ -61,7 +61,7 @@ namespace TAO_Default_ORT
 
 
 // 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 61c1f98a2aa..36c85b4e924 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:291
 
 
 #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:487
+// 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:1528
+// 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 d3130d45a4b..fd15a763402 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_
@@ -55,13 +55,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_ORT_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_ORT_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -72,13 +65,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:524
+  // be\be_valuetype.cpp:524
   
   
 
@@ -101,7 +94,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 +120,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 +145,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 +193,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 +214,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:431
+// be\be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -237,13 +230,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:969
+// be\be_codegen.cpp:947
 
 #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 5f17e0441fb..2b7e7fb7098 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/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 2f65f2588cb..277f18dc5d1 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -33,7 +33,7 @@
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
-#include "tao/PI_Forward.pidl"
+#include <PI_Forward.pidl>
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index 888caf9ba69..ddca4f12a28 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectReferenceTemplateC.h"
+#include "ObjectReferenceTemplate.h"
 #include "tao/Null_RefCount_Policy.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Alias_TypeCode.h"
@@ -38,7 +38,7 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:32
+// be\be_visitor_typecode/value_typecode.cpp:32
 
 static TAO::TypeCode::Value_Field<char const *> const * const _tao_fields_PortableInterceptor_ObjectReferenceFactory = 0;
 
@@ -63,7 +63,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:32
+// be\be_visitor_typecode/value_typecode.cpp:32
 
 static TAO::TypeCode::Value_Field<char const *> const * const _tao_fields_PortableInterceptor_ObjectReferenceTemplate = 0;
 
@@ -88,12 +88,12 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:785
+// be\be_visitor_typecode/typecode_defn.cpp:808
 
 namespace TAO
 {
@@ -127,7 +127,7 @@ namespace PortableInterceptor
 
 
 // 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
@@ -183,7 +183,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
@@ -239,7 +239,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<<= (
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index f2ff2beffe6..191314e4398 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:291
 
 
-#include "ObjectReferenceTemplateC.h"
+#include "ObjectReferenceTemplate.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:487
+// 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:487
+// 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:1528
+// 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 ccf8da3e3c5..abd9aa18d0e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -26,13 +26,16 @@
 //     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"
 
@@ -60,13 +63,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_ORT_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_ORT_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -77,13 +73,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:524
+  // be\be_valuetype.cpp:524
   
   
 
@@ -106,7 +102,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_
@@ -132,7 +128,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 (
@@ -140,7 +136,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);
@@ -157,12 +153,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:524
+  // be\be_valuetype.cpp:524
   
   
 
@@ -185,7 +181,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_
@@ -211,7 +207,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 (
@@ -219,7 +215,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 (
@@ -227,7 +223,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 (
@@ -235,7 +231,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);
@@ -252,12 +248,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_
@@ -312,24 +308,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
@@ -363,21 +359,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
@@ -385,7 +381,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:431
+// be\be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -394,13 +390,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:431
+// be\be_valuetype.cpp:431
 
 namespace CORBA
 {
@@ -409,13 +405,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_
@@ -432,7 +428,7 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.inl"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
index eaea7d71bda..c900a647347 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)