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

4 files changed, 104 insertions, 108 deletions

diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 07779a7625f..896032224e6 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -51,7 +51,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -75,7 +75,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate (
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::duplicate (
     PortableInterceptor::IORInfo_ptr p
   )
 {
@@ -84,7 +84,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release (
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::release (
     PortableInterceptor::IORInfo_ptr p
   )
 {
@@ -93,14 +93,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void)
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::nil (void)
 {
   return PortableInterceptor::IORInfo::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal (
+TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal (
     PortableInterceptor::IORInfo_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -109,7 +109,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -130,10 +130,10 @@ PortableInterceptor::IORInfo::_narrow (
     {
       return IORInfo::_nil ();
     }
-  
+
   IORInfo_ptr proxy =
     dynamic_cast<IORInfo_ptr> (_tao_objref);
-  
+
   return IORInfo::_duplicate (proxy);
 }
 
@@ -147,10 +147,10 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
     {
       return IORInfo::_nil ();
     }
-  
+
   IORInfo_ptr proxy =
     dynamic_cast<IORInfo_ptr> (_tao_objref);
-  
+
   return IORInfo::_duplicate (proxy);
 }
 
@@ -161,7 +161,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -223,7 +223,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
         PortableInterceptor::ObjectReferenceFactory *,
         PortableInterceptor::ObjectReferenceFactory_var,
         PortableInterceptor::ObjectReferenceFactory_out,
-        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> 
+        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory>
       >;
 
 #endif /* end #if !defined */
@@ -237,7 +237,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         PortableInterceptor::IORInfo
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::IORInfo
@@ -272,11 +272,10 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         PortableInterceptor::IORInfo
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::IORInfo
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index f749cd107d8..160cc0dd71e 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -72,13 +72,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -88,22 +88,22 @@ namespace TAO
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
-  
+
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IORInfo
       >
     IORInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IORInfo
@@ -111,43 +111,43 @@ namespace PortableInterceptor
     IORInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
-  
+
   class TAO_IORInterceptor_Export IORInfo
     : public virtual CORBA::Object
   {
   public:
     typedef IORInfo_ptr _ptr_type;
     typedef IORInfo_var _var_type;
-    
+
     // The static operations.
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-    
+
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInfo_ptr _nil (void)
     {
       return (IORInfo_ptr)0;
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_effective_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -155,10 +155,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_ior_component (
         const ::IOP::TaggedComponent & a_component
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -166,10 +166,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_ior_component_to_profile (
         const ::IOP::TaggedComponent & a_component,
         ::IOP::ProfileId profile_id
@@ -178,50 +178,50 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual PortableInterceptor::AdapterManagerId manager_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual PortableInterceptor::AdapterState state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void current_factory (
         ::PortableInterceptor::ObjectReferenceFactory * current_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -229,28 +229,28 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     IORInfo (void);
-    
+
     virtual ~IORInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IORInfo (const IORInfo &);
-    
+
     void operator= (const IORInfo &);
   };
 
@@ -270,18 +270,18 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo>
   {
-    static ::PortableInterceptor::IORInfo_ptr tao_duplicate (
+    static ::PortableInterceptor::IORInfo_ptr duplicate (
         ::PortableInterceptor::IORInfo_ptr
       );
-    static void tao_release (
+    static void release (
         ::PortableInterceptor::IORInfo_ptr
       );
-    static ::PortableInterceptor::IORInfo_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
+    static ::PortableInterceptor::IORInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
         ::PortableInterceptor::IORInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -308,4 +308,3 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 6e0d078e22a..be51db89f4b 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -57,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -66,7 +66,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -75,14 +75,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_nil (void)
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void)
 {
   return PortableInterceptor::IORInterceptor::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal (
+TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
     PortableInterceptor::IORInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -91,7 +91,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -112,10 +112,10 @@ PortableInterceptor::IORInterceptor::_narrow (
     {
       return IORInterceptor::_nil ();
     }
-  
+
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-  
+
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -129,10 +129,10 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
     {
       return IORInterceptor::_nil ();
     }
-  
+
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-  
+
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -143,7 +143,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -205,7 +205,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         PortableInterceptor::IORInterceptor
       >;
-  
+
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::IORInterceptor
@@ -222,11 +222,10 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         PortableInterceptor::IORInterceptor
       >
-  
+
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::IORInterceptor
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 1f2dd3fb3ba..e7e07e8f806 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -73,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -89,22 +89,22 @@ namespace TAO
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-  
+
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IORInterceptor
       >
     IORInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IORInterceptor
@@ -112,43 +112,43 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-  
+
   class TAO_IORInterceptor_Export IORInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef IORInterceptor_ptr _ptr_type;
     typedef IORInterceptor_var _var_type;
-    
+
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-    
+
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInterceptor_ptr _nil (void)
     {
       return (IORInterceptor_ptr)0;
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void establish_components (
         ::PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -156,10 +156,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void components_established (
         ::PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -167,10 +167,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void adapter_manager_state_changed (
         ::PortableInterceptor::AdapterManagerId id,
         ::PortableInterceptor::AdapterState state
@@ -179,10 +179,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void adapter_state_changed (
         const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates,
         ::PortableInterceptor::AdapterState state
@@ -191,28 +191,28 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     IORInterceptor (void);
-    
+
     virtual ~IORInterceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IORInterceptor (const IORInterceptor &);
-    
+
     void operator= (const IORInterceptor &);
   };
 
@@ -232,18 +232,18 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
   {
-    static ::PortableInterceptor::IORInterceptor_ptr tao_duplicate (
+    static ::PortableInterceptor::IORInterceptor_ptr duplicate (
         ::PortableInterceptor::IORInterceptor_ptr
       );
-    static void tao_release (
+    static void release (
         ::PortableInterceptor::IORInterceptor_ptr
       );
-    static ::PortableInterceptor::IORInterceptor_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
+    static ::PortableInterceptor::IORInterceptor_ptr nil (void);
+    static CORBA::Boolean marshal (
         ::PortableInterceptor::IORInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -270,4 +270,3 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
-