ChangeLogTag:Thu Mar 01 09:38:28 2001 Ossama Othman <ossama@uci.edu>

1 files changed, 58 insertions, 41 deletions

diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 0355ed31545..4a9f05edc20 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -21,15 +21,20 @@
 
 #include "PortableInterceptorC.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
 #endif /* !defined INLINE */
 
-#include "tao/CORBA_String.h"
+#include "CORBA_String.h"
 
 // default constructor
-PortableInterceptor::Interceptor::Interceptor (void)
-{}
+PortableInterceptor::Interceptor::Interceptor ()
+{
+  }
 
 // destructor
 PortableInterceptor::Interceptor::~Interceptor (void)
@@ -83,7 +88,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -157,7 +162,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -170,7 +175,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -330,7 +335,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -343,7 +348,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -376,8 +381,9 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
 
 
 // default constructor
-PortableInterceptor::Current::Current (void)
-{}
+PortableInterceptor::Current::Current ()
+{
+  }
 
 // destructor
 PortableInterceptor::Current::~Current (void)
@@ -443,7 +449,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -456,8 +462,9 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
 
 
 // default constructor
-PortableInterceptor::RequestInfo::RequestInfo (void)
-{}
+PortableInterceptor::RequestInfo::RequestInfo ()
+{
+  }
 
 // destructor
 PortableInterceptor::RequestInfo::~RequestInfo (void)
@@ -511,7 +518,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -524,8 +531,9 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co
 
 
 // default constructor
-PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
-{}
+PortableInterceptor::ClientRequestInfo::ClientRequestInfo ()
+{
+  }
 
 // destructor
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
@@ -591,7 +599,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -604,8 +612,9 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
 
 
 // default constructor
-PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
-{}
+PortableInterceptor::ServerRequestInfo::ServerRequestInfo ()
+{
+  }
 
 // destructor
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
@@ -671,7 +680,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -684,8 +693,9 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
 
 
 // default constructor
-PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
-{}
+PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor ()
+{
+  }
 
 // destructor
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
@@ -751,7 +761,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -764,8 +774,9 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository
 
 
 // default constructor
-PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
-{}
+PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor ()
+{
+  }
 
 // destructor
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
@@ -831,7 +842,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -844,8 +855,9 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
 
 
 // default constructor
-PortableInterceptor::IORInfo::IORInfo (void)
-{}
+PortableInterceptor::IORInfo::IORInfo ()
+{
+  }
 
 // destructor
 PortableInterceptor::IORInfo::~IORInfo (void)
@@ -899,7 +911,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -912,8 +924,9 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
 
 
 // default constructor
-PortableInterceptor::IORInterceptor::IORInterceptor (void)
-{}
+PortableInterceptor::IORInterceptor::IORInterceptor ()
+{
+  }
 
 // destructor
 PortableInterceptor::IORInterceptor::~IORInterceptor (void)
@@ -979,7 +992,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -992,8 +1005,9 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void)
 
 
 // default constructor
-PortableInterceptor::PolicyFactory::PolicyFactory (void)
-{}
+PortableInterceptor::PolicyFactory::PolicyFactory ()
+{
+  }
 
 // destructor
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
@@ -1047,7 +1061,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1060,8 +1074,9 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void)
 
 
 // default constructor
-PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
-{}
+PortableInterceptor::ORBInitInfo::ORBInitInfo ()
+{
+  }
 
 // destructor
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
@@ -1115,7 +1130,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1274,8 +1289,9 @@ CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
 
 
 // default constructor
-PortableInterceptor::ORBInitializer::ORBInitializer (void)
-{}
+PortableInterceptor::ORBInitializer::ORBInitializer ()
+{
+  }
 
 // destructor
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
@@ -1329,7 +1345,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1599,3 +1615,4 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+