Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 26 insertions, 40 deletions

diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index d0a8fc4c313..87aeead2e8b 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -22,8 +22,7 @@ const IOP::ServiceId
 Client_Interceptor::SchedulingInfo = 30;
 
 void
-Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -75,7 +74,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
             {
               ACE_DEBUG ((LM_DEBUG,
                           "No Scheduling Segment Context\n"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw ( ::CORBA::INTERNAL ());
 
             }
 
@@ -90,7 +89,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                                               current->dt_hash (),
                                               guid,
                                               0,
-                                              current->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER),
+                                              current->implicit_scheduling_parameter (),
                                               0,
                                               dt.in (),
                                               current));
@@ -119,8 +118,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -140,8 +138,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -161,8 +158,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL)
+Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -187,8 +183,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         }
 
       CORBA::Any_var ex =
-        ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->received_exception ();
       CORBA::TypeCode_var type = ex->type ();
 
       if (CORBA::is_nil (type.in ()))
@@ -197,8 +192,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
                       "type = 0 \n"));
           return;
         }
-      const char * id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      const char * id = type->id ();
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -213,8 +207,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         {
           // Perform the necessary cleanup as the
           // thread was cancelled.
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          current->cancel_thread ();
         }
       else
         {
@@ -227,8 +220,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 }
 
 void
-Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -249,14 +241,14 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 char*
-Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  CORBA::string_dup ("RTSchdeuler_Client_Interceptor");
 }
 
 void
-Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -270,8 +262,8 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current)
 }
 
 void
-Server_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+Server_Interceptor::receive_request_service_contexts (
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -283,7 +275,7 @@ Server_Interceptor::receive_request_service_contexts (PortableInterceptor::Serve
 
 void
 Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -293,22 +285,19 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
   IOP::ServiceContext_var serv_cxt;
 
-  ACE_TRY
+  try
     {
       serv_cxt =
         ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        );
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception&)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "Invalid Service Request\n"));
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -328,7 +317,6 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
                              TAO::VMCID,
                              ENOMEM),
                            CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   // Scheduler retrieves scheduling parameters
   // from request and populates the out
@@ -371,7 +359,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
   if (result != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ( ::CORBA::INTERNAL ());
     }
 
   // Create new temporary current. Note that the new <sched_param> is
@@ -392,7 +380,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
 void
 Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -410,8 +398,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
       if (current->DT ()->state () == RTScheduling::DistributableThread::CANCELLED)
         {
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          current->cancel_thread ();
 
           return;
         }
@@ -421,8 +408,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
       // Inform scheduler that upcall is complete.
       RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      scheduler->send_reply (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -443,7 +429,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
 void
 Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -469,7 +455,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 
 void
 Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -494,14 +480,14 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 char*
-Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return  CORBA::string_dup ("RTSchdeuler_Server_Interceptor");
 }
 
 void
-Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {