ChangeLogTag: Wed Oct 26 15:45:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 253 insertions, 363 deletions

diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
index 1dc8ac2a761..514a418c751 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
@@ -25,12 +25,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServerRequestInfoC.h"
+#include "ServerRequestInfoA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -41,10 +42,10 @@
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ServerRequestInfo (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
     "ServerRequestInfo");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
@@ -52,78 +53,3 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInfo,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.h b/TAO/tao/PI_Server/ServerRequestInfoA.h
new file mode 100644
index 00000000000..680a45acc98
--- /dev/null
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVERREQUESTINFOA_H_
+#define _TAO_IDL_SERVERREQUESTINFOA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/pi_server_export.h"
+#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "tao/PI/RequestInfoA.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/AnyTypeCode/Policy_ForwardA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableInterceptor
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableInterceptor
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
index eab818b9b7f..9f2c4d4a524 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServerRequestInfoC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -74,13 +70,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
   return PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
     PortableInterceptor::ServerRequestInfo_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
@@ -89,17 +85,9 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-void 
-PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInfo *_tao_tmp_pointer =
-    static_cast<ServerRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -110,7 +98,7 @@ PortableInterceptor::ServerRequestInfo::_narrow (
 
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -136,7 +124,7 @@ PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
   CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -174,7 +162,7 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
   return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
 {
   return false;
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h
index 6cbeedeb0dc..7df272daa25 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.h
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
+#ifndef _TAO_IDL_SERVERREQUESTINFOC_H_
+#define _TAO_IDL_SERVERREQUESTINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,14 +41,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI_Server/pi_server_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -60,36 +59,27 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInfo
       >
     ServerRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInfo
@@ -97,192 +87,187 @@ namespace PortableInterceptor
     ServerRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-
+  
   class TAO_PI_Server_Export ServerRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ServerRequestInfo_ptr _ptr_type;
     typedef ServerRequestInfo_var _var_type;
-
+    
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-
+    
     static void _tao_release (ServerRequestInfo_ptr obj);
-
+    
     static ServerRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _nil (void)
     {
       return static_cast<ServerRequestInfo_ptr> (0);
     }
-
-    static void _tao_any_destructor (void *);
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * sending_exception (
+    
+    virtual ::CORBA::Any * sending_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * server_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * adapter_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * target_most_derived_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean target_is_a (
+    
+    virtual ::CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
+    
+    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);
-
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     // Abstract or local interface only.
     ServerRequestInfo (void);
-
+    
     virtual ~ServerRequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInfo (const ServerRequestInfo &);
-
+    
     void operator= (const ServerRequestInfo &);
   };
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -293,9 +278,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
+  
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -306,7 +291,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInfo_ptr
       );
     static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -316,22 +301,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
-TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1040
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index 58a08ac8132..b91ba552fe5 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -25,12 +25,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServerRequestInterceptorC.h"
+#include "ServerRequestInterceptorA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -41,10 +42,10 @@
 static TAO::TypeCode::Objref<char const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_PortableInterceptor_ServerRequestInterceptor (
-    CORBA::tk_local_interface,
+    ::CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
     "ServerRequestInterceptor");
-
+  
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
@@ -52,78 +53,3 @@ namespace PortableInterceptor
 }
 
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInterceptor,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
new file mode 100644
index 00000000000..c01c91db449
--- /dev/null
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_
+#define _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/pi_server_export.h"
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
+#include "tao/PI/InterceptorA.h"
+#include "tao/PI/PIForwardRequestA.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableInterceptor
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableInterceptor
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 82e30f3c415..343bbceb502 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServerRequestInterceptorC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -74,13 +70,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void)
   return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
     PortableInterceptor::ServerRequestInterceptor_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
@@ -89,17 +85,9 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void 
-PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInterceptor *_tao_tmp_pointer =
-    static_cast<ServerRequestInterceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -110,7 +98,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
 
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -136,7 +124,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc
   CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -174,7 +162,7 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
   return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 {
   return false;
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index 826741ec9e6..1003d070540 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
+#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
+#define _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,7 +41,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI_Server/pi_server_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,23 +56,14 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -96,7 +86,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -137,12 +127,12 @@ namespace PortableInterceptor
     static void _tao_release (ServerRequestInterceptor_ptr obj);
 
     static ServerRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServerRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
@@ -151,7 +141,7 @@ namespace PortableInterceptor
       return static_cast<ServerRequestInterceptor_ptr> (0);
     }
 
-    static void _tao_any_destructor (void *);
+
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -164,7 +154,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) {}
 
@@ -178,7 +168,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -190,7 +180,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -202,66 +192,61 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
+
+    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);
-  
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
   protected:
     // Abstract or local interface only.
     ServerRequestInterceptor (void);
-    
+
     virtual ~ServerRequestInterceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInterceptor (const ServerRequestInterceptor &);
-    
+
     void operator= (const ServerRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -272,9 +257,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -285,7 +270,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInfo_ptr
       );
     static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -293,9 +278,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
@@ -306,7 +291,7 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -316,22 +301,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
-TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
-TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1040
 
 #include /**/ "ace/post.h"