1 files changed, 7 insertions, 19 deletions
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;