1 files changed, 26 insertions, 22 deletions

diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp
index 4ed08fabe20..7ecc261b227 100644
--- a/TAO/tao/PI/PIForwardRequestC.cpp
+++ b/TAO/tao/PI/PIForwardRequestC.cpp
@@ -26,19 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/PIForwardRequestC.h"
+#include "PIForwardRequestC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.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
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -49,7 +51,7 @@ namespace TAO
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
-  : ::CORBA::UserException (
+  : CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
@@ -61,7 +63,7 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 }
 
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-  : ::CORBA::UserException (
+  : CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -72,7 +74,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
 PortableInterceptor::ForwardRequest&
 PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
 {
-  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
   return *this;
 }
@@ -85,28 +87,28 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p
 }
 
 PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception *_tao_excp)
+PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<ForwardRequest *> (_tao_excp);
 }
 
 const PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception const *_tao_excp)
+PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const ForwardRequest *> (_tao_excp);
 }
 
-::CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
+CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
 {
-  ::CORBA::Exception *retval = 0;
+  CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0);
   return retval;
 }
 
-::CORBA::Exception *
+CORBA::Exception *
 PortableInterceptor::ForwardRequest::_tao_duplicate (void) const
 {
-  ::CORBA::Exception *result = 0;
+  CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::PortableInterceptor::ForwardRequest (*this),
@@ -130,7 +132,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
       return;
     }
   
-  ACE_THROW ( ::CORBA::MARSHAL ());
+  ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ForwardRequest::_tao_decode (
@@ -143,7 +145,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
       return;
     }
   
-  ACE_THROW ( ::CORBA::MARSHAL ());
+  ACE_THROW (CORBA::MARSHAL ());
 }
 
 
@@ -152,9 +154,9 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
 // be\be_visitor_exception/exception_ctor.cpp:66
 
 PortableInterceptor::ForwardRequest::ForwardRequest (
-    const ::CORBA::Object_ptr  _tao_forward
+    const CORBA::Object_ptr  _tao_forward
   )
-  : ::CORBA::UserException (
+  : CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
@@ -162,12 +164,16 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
   this->forward = CORBA::Object::_duplicate (_tao_forward);
 }
 
-
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const
+{
+  return ::PortableInterceptor::_tc_ForwardRequest;
+}
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
-::CORBA::Boolean operator<< (
+CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableInterceptor::ForwardRequest &_tao_aggregate
   )
@@ -186,7 +192,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
     }
 }
 
-::CORBA::Boolean operator>> (
+CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     PortableInterceptor::ForwardRequest &_tao_aggregate
   )
@@ -196,5 +202,3 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
     (strm >> _tao_aggregate.forward.out ())
   );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL