1 files changed, 27 insertions, 28 deletions

diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 71cd4edcd4e..fb81056443c 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -14,37 +14,37 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 }
 
 void
-Peer_Handler_i::request (CORBA::Long retval,
-                         CORBA::Environment &ACE_TRY_ENV)
+Peer_Handler_i::request (CORBA::Long retval
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i));
-  this->peer_->reply (retval, ACE_TRY_ENV);
+  this->peer_->reply (retval TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
 Peer_Handler_i::request_excep (
-    AMI_PeerExceptionHolder * excep_holder,
-    CORBA::Environment &ACE_TRY_ENV)
+    AMI_PeerExceptionHolder * excep_holder
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (excep_holder);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  TAO_ENV_ARG_NOT_USED;
 }
 
 
 void
-Peer_Handler_i::start (CORBA::Environment &)
+Peer_Handler_i::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::shutdown (CORBA::Environment &)
+Peer_Handler_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -62,33 +62,33 @@ Peer_i::~Peer_i (void)
 void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
-              const ACE_Time_Value &delay,
-              CORBA::Environment &ACE_TRY_ENV)
+              const ACE_Time_Value &delay
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
   this->delay_ = delay;
 
-  Peer_var peer = this->_this (ACE_TRY_ENV);
+  Peer_var peer = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
-  this->id_ = this->progress_->bind (peer.in (), ACE_TRY_ENV);
+  this->id_ = this->progress_->bind (peer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Peer_i::reply (CORBA::Long result,
-               CORBA::Environment &ACE_TRY_ENV)
+Peer_i::reply (CORBA::Long result
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->progress_->recv_reply (result, ACE_TRY_ENV);
+  this->progress_->recv_reply (result TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Long
-Peer_i::request (CORBA::Long id,
-                 CORBA::Environment &)
+Peer_i::request (CORBA::Long id
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
@@ -99,12 +99,12 @@ Peer_i::request (CORBA::Long id,
 
 void
 Peer_i::start (const PeerSet &the_peers,
-               CORBA::Long iterations,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Long iterations
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
-    this->reply_handler_._this (ACE_TRY_ENV);
+    this->reply_handler_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Report errors as exceptions...
@@ -118,10 +118,10 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Peer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -147,16 +147,15 @@ Peer_Task::svc (void)
       CORBA::ULong l = this->the_peers_.length ();
       for (CORBA::ULong j = 0; j != l; ++j)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          ACE_TRY_NEW_ENV
             {
               this->the_peers_[j]->sendc_request (this->handler_.in (),
-                                                  this->id_,
-                                                  ACE_TRY_ENV);
+                                                  this->id_
+                                                  TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->progress_->sent_request (this->id_,
-                                             ACE_TRY_ENV);
+              this->progress_->sent_request (this->id_
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY