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

1 files changed, 24 insertions, 36 deletions

diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index b3577fb9e7e..616bf0dff47 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -36,12 +36,11 @@ namespace TAO
   void
   Invocation_Adapter::invoke (TAO::Exception_Data *ex_data,
                               unsigned long ex_count
-                              ACE_ENV_ARG_DECL)
+                              )
   {
     // Should stub object be refcounted here?
     TAO_Stub *stub =
-      this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->get_stub ();
 
     TAO_Operation_Details op_details (this->operation_,
                                       this->op_len_,
@@ -53,14 +52,13 @@ namespace TAO
 
     this->invoke_i (stub,
                     op_details
-                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                   );
   }
 
   void
   Invocation_Adapter::invoke_i (TAO_Stub *stub,
                                 TAO_Operation_Details &details
-                                ACE_ENV_ARG_DECL)
+                                )
   {
     // The invocation has got to be within the context of the
     // corresponding ORB's configuration. Otherwise things like
@@ -90,8 +88,7 @@ namespace TAO
           {
             strat =
               TAO_ORB_Core::collocation_strategy (effective_target.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                                 );
           }
 
         if (strat == TAO_CS_REMOTE_STRATEGY ||
@@ -103,8 +100,7 @@ namespace TAO
                                      details,
                                      effective_target,
                                      max_wait_time
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                    );
           }
         else
           {
@@ -119,8 +115,7 @@ namespace TAO
                                          details,
                                          effective_target,
                                          strat
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                        );
           }
 
         if (status == TAO_INVOKE_RESTART)
@@ -151,7 +146,7 @@ namespace TAO
   }
 
   TAO_Stub *
-  Invocation_Adapter::get_stub (ACE_ENV_SINGLE_ARG_DECL) const
+  Invocation_Adapter::get_stub (void) const
   {
     TAO_Stub * const stub =
       this->target_->_stubobj ();
@@ -172,7 +167,7 @@ namespace TAO
                                            TAO_Operation_Details &details,
                                            CORBA::Object_var &effective_target,
                                            Collocation_Strategy strat
-                                           ACE_ENV_ARG_DECL)
+                                           )
   {
     // To make a collocated call we must have a collocated proxy broker, the
     // invoke_i() will make sure that we only come here when we have one
@@ -192,8 +187,7 @@ namespace TAO
     status =
       coll_inv.invoke (this->cpb_,
                        strat
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                      );
 
     if (status == TAO_INVOKE_RESTART &&
         coll_inv.is_forwarded ())
@@ -211,8 +205,7 @@ namespace TAO
         (void) this->object_forwarded (effective_target,
                                        stub,
                                        is_permanent_forward
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                      );
       }
 
     return status;
@@ -259,7 +252,7 @@ namespace TAO
                                        TAO_Operation_Details &details,
                                        CORBA::Object_var &effective_target,
                                        ACE_Time_Value *&max_wait_time
-                                       ACE_ENV_ARG_DECL)
+                                       )
   {
     ACE_Time_Value tmp_wait_time;
     bool is_timeout  =
@@ -286,8 +279,7 @@ namespace TAO
       block_connect);
 
     resolver.resolve (max_wait_time
-                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                     );
 
     if (TAO_debug_level)
       {
@@ -307,7 +299,7 @@ namespace TAO
                                     effective_target,
                                     resolver,
                                     max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
       }
     else if (this->type_ == TAO_TWOWAY_INVOCATION)
       {
@@ -315,7 +307,7 @@ namespace TAO
                                     effective_target,
                                     resolver,
                                     max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
       }
 
     return TAO_INVOKE_FAILURE;
@@ -326,7 +318,7 @@ namespace TAO
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
                                      ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
+                                     )
   {
     // Simple sanity check
     if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION ||
@@ -346,8 +338,7 @@ namespace TAO
 
     Invocation_Status const status =
       synch.remote_twoway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                          );
 
     if (status == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
@@ -365,8 +356,7 @@ namespace TAO
         this->object_forwarded (effective_target,
                                 r.stub (),
                                 is_permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                               );
       }
 
     return status;
@@ -377,7 +367,7 @@ namespace TAO
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
                                      ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
+                                     )
   {
     TAO::Synch_Oneway_Invocation synch (this->target_,
                                         r,
@@ -385,8 +375,7 @@ namespace TAO
 
     Invocation_Status const s =
       synch.remote_oneway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                          );
 
     if (s == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
@@ -403,8 +392,7 @@ namespace TAO
         this->object_forwarded (effective_target,
                                 r.stub (),
                                 is_permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                               );
       }
 
     return s;
@@ -414,7 +402,7 @@ namespace TAO
   Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
                                         TAO_Stub *stub,
                                         CORBA::Boolean permanent_forward
-                                        ACE_ENV_ARG_DECL)
+                                        )
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
@@ -422,7 +410,7 @@ namespace TAO
       effective_target->_stubobj ();
 
     if (stubobj == 0)
-      ACE_THROW (CORBA::INTERNAL (
+      throw ( ::CORBA::INTERNAL (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
           errno),
@@ -433,7 +421,7 @@ namespace TAO
     stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
     if (stub->next_profile () == 0)
-      ACE_THROW (CORBA::TRANSIENT (
+      throw ( ::CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
           errno),