1 files changed, 26 insertions, 26 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index a00cc6dd248..2f07b99f486 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -31,12 +31,12 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
 
 void
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
-  TAO_GIOP_Invocation *invocation,
-  CORBA::Environment &ACE_TRY_ENV)
+  TAO_GIOP_Invocation *invocation
+  TAO_ENV_ARG_DECL)
 {
 
-  int retval = this->select_endpoint_i (invocation,
-                                        ACE_TRY_ENV);
+  int retval = this->select_endpoint_i (invocation
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retval == 0)
@@ -46,8 +46,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
                     "(%P|%t) TAO-FT - Primary doesnt exist.",
                     "Falling back on the default selection routines \n"));
 
-      TAO_Default_Endpoint_Selector::select_endpoint (invocation,
-                                                      ACE_TRY_ENV);
+      TAO_Default_Endpoint_Selector::select_endpoint (invocation
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -56,8 +56,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
 
 // @@ RTCORBA_Subsetting - next should be deprecated...
 void
-TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *,
-                                     CORBA::Environment &)
+TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n")));
   // if (invocation->stub_->next_profile_retry () == 0)
@@ -68,8 +68,8 @@ TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *,
 void
 TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
-                                        const TAO_MProfile &mprofile,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const TAO_MProfile &mprofile
+                                        TAO_ENV_ARG_DECL)
 {
   invocation->stub ()->add_forward_profiles (mprofile);
   // This has to be and is thread safe.
@@ -105,12 +105,12 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo
 
 int
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
-    TAO_GIOP_Invocation *invocation,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_GIOP_Invocation *invocation
+    TAO_ENV_ARG_DECL)
 {
   int retval =
-    this->select_primary (invocation,
-                          ACE_TRY_ENV);
+    this->select_primary (invocation
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -165,8 +165,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
           invocation->endpoint (invocation->profile ()->endpoint ());
 
           int status =
-            this->endpoint_from_profile (invocation,
-                                         ACE_TRY_ENV);
+            this->endpoint_from_profile (invocation
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (status == 1)
@@ -184,8 +184,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
 
 int
 TAO_FT_Invocation_Endpoint_Selector::select_primary (
-    TAO_GIOP_Invocation *invoc,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_GIOP_Invocation *invoc
+    TAO_ENV_ARG_DECL)
 {
   // Get the current profile
   TAO_Profile *temp_profile =
@@ -198,8 +198,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       // Check whether we have a primary profile in hand.
       retval =
         this->check_profile_for_primary (invoc,
-                                         temp_profile,
-                                         ACE_TRY_ENV);
+                                         temp_profile
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
@@ -254,8 +254,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       // Check whether we have a primary profile in hand.
       retval =
         this->check_profile_for_primary (invoc,
-                                         temp_profile,
-                                         ACE_TRY_ENV);
+                                         temp_profile
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (retval == 1 || retval == -1)
@@ -286,8 +286,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
 int
 TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
     TAO_GIOP_Invocation *invocation,
-    TAO_Profile*pfile,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile*pfile
+    TAO_ENV_ARG_DECL)
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = IOP::TAG_FT_PRIMARY;
@@ -309,8 +309,8 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
       invocation->endpoint (invocation->profile ()->endpoint ());
 
       int status =
-        this->endpoint_from_profile (invocation,
-                                     ACE_TRY_ENV);
+        this->endpoint_from_profile (invocation
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (status == 1)