ChangeLogTag:Thu Sep 2 22:21:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 240 insertions, 244 deletions

diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index 030e2282cb1..60aeb7eed9d 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -59,24 +59,24 @@ 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 (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 (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
@@ -101,27 +101,27 @@ namespace TAO_Default_ORT
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref (
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref (
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_release (
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release (
     TAO_Default_ORT::ObjectReferenceTemplate * p
   )
 {
@@ -135,7 +135,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v);
 }
 
@@ -180,29 +180,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -370,13 +370,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
   template class
     TAO_Value_Var_T<
         TAO_Default_ORT::ObjectReferenceTemplate
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         TAO_Default_ORT::ObjectReferenceTemplate
-        
+
       >;
 
   template class
@@ -394,13 +394,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
 # pragma instantiate \
     TAO_Value_Var_T< \
         TAO_Default_ORT::ObjectReferenceTemplate \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         TAO_Default_ORT::ObjectReferenceTemplate \
-        
+
       >
 
 # pragma instantiate \
@@ -408,5 +408,4 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
         TAO_Default_ORT::ObjectReferenceTemplate \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index 9a3d1b72180..7588135a1a8 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -206,9 +206,9 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
   {
-    static void tao_add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-    static void tao_remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-    static void tao_release (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void release (TAO_Default_ORT::ObjectReferenceTemplate *);
   };
 
 #endif /* end #if !defined */
@@ -254,4 +254,3 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 5c011c5ecc2..7ae8e3c69bc 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -56,13 +56,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_ORT_Export Arg_Traits<CORBA::StringSeq>
     : public
@@ -85,27 +85,27 @@ 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 (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 (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
@@ -130,27 +130,27 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_release (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
     PortableInterceptor::ObjectReferenceFactory * p
   )
 {
@@ -164,7 +164,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v);
 }
 
@@ -199,29 +199,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
@@ -235,27 +235,27 @@ 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 (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 (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
@@ -280,27 +280,27 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_release (
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
     PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
@@ -314,7 +314,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v);
 }
 
@@ -349,36 +349,36 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
@@ -441,29 +441,29 @@ 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 (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 (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
@@ -472,33 +472,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
     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 (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 (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,
 
 };
@@ -629,7 +629,7 @@ operator>>= (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -803,20 +803,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -826,7 +826,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -836,28 +836,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return 0;
 }
 
@@ -890,13 +890,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceFactory
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceFactory
-        
+
       >;
 
   template class
@@ -918,13 +918,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceTemplate
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceTemplate
-        
+
       >;
 
   template class
@@ -1006,13 +1006,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceFactory \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceFactory \
-        
+
       >
 
 # pragma instantiate \
@@ -1034,13 +1034,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-        
+
       >
 
 # pragma instantiate \
@@ -1092,5 +1092,4 @@ CORBA::Boolean operator>> (
         PortableInterceptor::ObjectReferenceTemplateSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index b012e1941d6..d2a256eac7d 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -82,22 +82,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-  
-  
+
+
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-  
+
   class ObjectReferenceFactory;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceFactory
       >
     ObjectReferenceFactory_var;
-  
+
   typedef
     TAO_Value_Out_T<
         ObjectReferenceFactory
@@ -105,78 +105,78 @@ namespace PortableInterceptor
     ObjectReferenceFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-  
+
   class TAO_ORT_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
   public:
     typedef ObjectReferenceFactory_var _var_type;
-    
+
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-    
+
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-    
+
     virtual const char* _tao_obv_repository_id (void) const;
-    
+
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-    
+
   public:
     virtual CORBA::Object_ptr make_object (
         const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-  
+
   protected:
     ObjectReferenceFactory (void);
-    
+
     virtual ~ObjectReferenceFactory (void);
-    
-    
+
+
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-  
-  
+
+
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-  
+
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-  
+
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -184,87 +184,87 @@ namespace PortableInterceptor
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-  
+
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-    
+
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-    
+
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-    
+
     virtual const char* _tao_obv_repository_id (void) const;
-    
+
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-    
+
   public:
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-    
+
   public:
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-    
+
   public:
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-  
+
   protected:
     ObjectReferenceTemplate (void);
-    
+
     virtual ~ObjectReferenceTemplate (void);
-    
-    
+
+
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
+
   class ObjectReferenceTemplateSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ObjectReferenceTemplateSeq,
@@ -274,7 +274,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ObjectReferenceTemplateSeq,
@@ -285,7 +285,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_out;
-  
+
   class TAO_ORT_Export ObjectReferenceTemplateSeq
     : public
         TAO_Unbounded_Valuetype_Sequence<
@@ -299,22 +299,22 @@ namespace PortableInterceptor
     ObjectReferenceTemplateSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer, 
+        ObjectReferenceTemplate ** buffer,
         CORBA::Boolean release = 0
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
 
 // TAO_IDL - Generated from
@@ -338,26 +338,26 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
   {
-    static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void tao_release (PortableInterceptor::ObjectReferenceFactory *);
+    static void add_ref (PortableInterceptor::ObjectReferenceFactory *);
+    static void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
+    static void release (PortableInterceptor::ObjectReferenceFactory *);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
   {
-    static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void tao_release (PortableInterceptor::ObjectReferenceTemplate *);
+    static void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
+    static void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
+    static void release (PortableInterceptor::ObjectReferenceTemplate *);
   };
 
 #endif /* end #if !defined */
@@ -450,4 +450,3 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-