1 files changed, 19 insertions, 33 deletions

diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index f4e81a5b099..48699b49cdd 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -11,34 +11,32 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 }
 
 void
-Peer_Handler_i::request (CORBA::Long retval
-                         ACE_ENV_ARG_DECL)
+Peer_Handler_i::request (CORBA::Long retval)
     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_ENV_ARG_PARAMETER);
+  this->peer_->reply (retval);
 }
 
 
 void
 Peer_Handler_i::request_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::start (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -56,33 +54,28 @@ Peer_i::~Peer_i (void)
 void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
-              const ACE_Time_Value &delay
-              ACE_ENV_ARG_DECL)
+              const ACE_Time_Value &delay)
     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_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Peer_var peer = this->_this ();
 
   ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
-  this->id_ = this->progress_->bind (peer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->id_ = this->progress_->bind (peer.in ());
 }
 
 void
-Peer_i::reply (CORBA::Long result
-               ACE_ENV_ARG_DECL)
+Peer_i::reply (CORBA::Long result)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->progress_->recv_reply (result ACE_ENV_ARG_PARAMETER);
+  this->progress_->recv_reply (result);
 }
 
 CORBA::Long
-Peer_i::request (CORBA::Long id
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Peer_i::request (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
@@ -93,13 +86,11 @@ Peer_i::request (CORBA::Long id
 
 void
 Peer_i::start (const PeerSet &the_peers,
-               CORBA::Long iterations
-               ACE_ENV_ARG_DECL)
+               CORBA::Long iterations)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
-    this->reply_handler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->reply_handler_._this ();
 
   // @@ Report errors as exceptions...
   Peer_Task *task;
@@ -112,10 +103,10 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 // ****************************************************************
@@ -141,22 +132,17 @@ Peer_Task::svc (void)
       CORBA::ULong l = this->the_peers_.length ();
       for (CORBA::ULong j = 0; j != l; ++j)
         {
-          ACE_TRY_NEW_ENV
+          try
             {
               this->the_peers_[j]->sendc_request (this->handler_.in (),
-                                                  this->id_
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                  this->id_);
 
-              this->progress_->sent_request (this->id_
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->progress_->sent_request (this->id_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Ignore exceptions;
             }
-          ACE_ENDTRY;
         }
       if (i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d requests sent\n", i));