Merged corba-env-clean branch.

9 files changed, 165 insertions, 165 deletions

diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 351dcdbc917..a9f009ecf92 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -24,9 +24,9 @@ EC_Connect::EC_Connect (void)
 }
 
 void
-EC_Connect::execute_test (CORBA::Environment&)
+EC_Connect::execute_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
+  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -108,13 +108,13 @@ EC_Connect::dump_results (void)
 void
 EC_Connect::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_consumer (consumer_admin,
-                                     i,
-                                     ACE_TRY_ENV);
+                                     i
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->consumer_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -123,13 +123,13 @@ EC_Connect::connect_consumer (
 void
 EC_Connect::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_supplier (supplier_admin,
-                                     i,
-                                     ACE_TRY_ENV);
+                                     i
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->supplier_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -148,23 +148,23 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
     {
     default:
     case 0:
-      this->connect_consumers (ACE_TRY_ENV);
+      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_suppliers (ACE_TRY_ENV);
+      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->connect_suppliers (ACE_TRY_ENV);
+      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_consumers (ACE_TRY_ENV);
+      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -177,23 +177,23 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i != max; ++i)
     {
       if (i < this->n_consumers_)
         {
-          this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV);
+          this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       if (i < this->n_suppliers_)
         {
-          this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV);
+          this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -201,22 +201,22 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
   switch (this->order_)
     {
     default:
     case 0:
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -229,11 +229,11 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
@@ -243,7 +243,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+          this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -254,7 +254,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->consumers_[i]->disconnect (ACE_TRY_ENV);
+          this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -268,14 +268,14 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -290,14 +290,14 @@ EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -323,25 +323,25 @@ void
 ECC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   this->EC_Consumer::connect (consumer_admin,
                               qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Consumer::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
@@ -365,25 +365,25 @@ void
 ECC_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   this->EC_Supplier::connect (supplier_admin,
                               qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Supplier::connect (
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Supplier::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 1b58133482e..5d09185b9ae 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -51,27 +51,27 @@ public:
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
+    int i
+    TAO_ENV_ARG_DECL);
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnect_consumers (CORBA::Environment& env);
-  virtual void disconnect_suppliers (CORBA::Environment& env);
+    int i
+    TAO_ENV_ARG_DECL);
+  virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (CORBA::Environment&);
-  virtual void disconnect_clients (CORBA::Environment&);
+  virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   ACE_hrtime_t start_time_;
@@ -94,12 +94,12 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
@@ -117,12 +117,12 @@ public:
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
+        int shutdown_event_type
+        TAO_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::SupplierQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index cb9d8629241..8d01cace479 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -54,10 +54,10 @@ EC_Inversion::parse_args (int &argc, char *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos0;
@@ -67,8 +67,8 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 
   this->consumers_[0]->connect (consumer_admin.in (),
                                 qos0.get_ConsumerQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1,
-                                ACE_TRY_ENV);
+                                ACE_ES_EVENT_UNDEFINED + 1
+                                TAO_ENV_ARG_PARAMETER);
 
   for (int i = 1; i < this->n_consumers_; ++i)
     {
@@ -83,18 +83,18 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 
       this->consumers_[i]->connect (consumer_admin.in (),
                                     qos1.get_ConsumerQOS (),
-                                    base_event + 1,
-                                    ACE_TRY_ENV);
+                                    base_event + 1
+                                    TAO_ENV_ARG_PARAMETER);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n"));
 }
 
 void
-EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_SupplierQOS_Factory qos0;
@@ -103,8 +103,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 
   this->suppliers_[0]->connect (supplier_admin.in (),
                                 qos0.get_SupplierQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1,
-                                ACE_TRY_ENV);
+                                ACE_ES_EVENT_UNDEFINED + 1
+                                TAO_ENV_ARG_PARAMETER);
 
   for (int j = 1; j != this->n_suppliers_; ++j)
     {
@@ -118,8 +118,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 
       this->suppliers_[j]->connect (supplier_admin.in (),
                                     qos1.get_SupplierQOS (),
-                                    base_event + 1,
-                                    ACE_TRY_ENV);
+                                    base_event + 1
+                                    TAO_ENV_ARG_PARAMETER);
     }
 
   if (this->verbose ())
@@ -127,7 +127,7 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Inversion::activate_tasks (CORBA::Environment &)
+EC_Inversion::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index b5c401cfe06..4f9bc592bfc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -41,14 +41,14 @@ public:
   // The options controlling the event types are ignored, and only two
   // consumers are created.
 
-  virtual void connect_consumers (CORBA::Environment &ACE_TRY_ENV);
-  virtual void connect_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // In this test there are two consumers, the high priority consumer
   // receives only events from a single high priority supplier.  The
   // other consumer receives events from a set of low priority
   // suppliers.
 
-  virtual void activate_tasks (CORBA::Environment &);
+  virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Activate the suppliers at different priorities
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 2a8bd9f6e2e..9cafab8e20e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -49,18 +49,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -70,12 +70,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -84,7 +84,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -93,14 +93,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,12 +108,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ec_ior, ACE_TRY_ENV);
+        orb->string_to_object (ec_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -135,15 +135,15 @@ main (int argc, char *argv [])
       // Connect the consumer
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (ACE_TRY_ENV);
+        ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer_reference =
-        consumer._this (ACE_TRY_ENV);
+        consumer._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -161,8 +161,8 @@ main (int argc, char *argv [])
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
       proxy_supplier->connect_push_consumer (consumer_reference.in (),
-                                             consumer_qos,
-                                             ACE_TRY_ENV);
+                                             consumer_qos
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
@@ -172,15 +172,15 @@ main (int argc, char *argv [])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (ACE_TRY_ENV);
+        ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier_reference =
-        supplier._this (ACE_TRY_ENV);
+        supplier._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -193,8 +193,8 @@ main (int argc, char *argv [])
       sh0.source = 1;                      // first free event source
 
       proxy_consumer->connect_push_supplier (supplier_reference.in (),
-                                             supplier_qos,
-                                             ACE_TRY_ENV);
+                                             supplier_qos
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
@@ -207,7 +207,7 @@ main (int argc, char *argv [])
       while (!task.done () || !consumer.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -238,24 +238,24 @@ main (int argc, char *argv [])
 
       ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
 
-      proxy_supplier->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy_supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      proxy_consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy_consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id;
 
-      id = root_poa->servant_to_id (&consumer, ACE_TRY_ENV);
+      id = root_poa->servant_to_id (&consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      id = root_poa->servant_to_id (&supplier, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      id = root_poa->servant_to_id (&supplier TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -282,19 +282,19 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'k':
-	ec_ior = get_opts.optarg;
-	break;
+        ec_ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-i <iterations>"
-			   "-k <IOR>"
+                           "-i <iterations>"
+                           "-k <IOR>"
                            "\n",
                            argv [0]),
                           -1);
@@ -322,8 +322,8 @@ EC_Latency_Consumer::done (void)
 }
 
 void
-EC_Latency_Consumer::push (const RtecEventComm::EventSet& events,
-                           CORBA::Environment &)
+EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
@@ -343,7 +343,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
+EC_Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -355,7 +355,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (CORBA::Environment &)
+EC_Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -393,7 +393,7 @@ Task::svc (void)
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
-          this->consumer_->push (event, ACE_TRY_ENV);
+          this->consumer_->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index e0aa6fa32f1..4d9b2287736 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -38,11 +38,11 @@ public:
 
   /// Return 1 when all the messages have been received
   int done (void);
-  
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &)
+
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -64,7 +64,7 @@ public:
   /// Constructor
   EC_Latency_Supplier (void);
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 3cf2c2335e5..ce6a4225dc5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -48,18 +48,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -69,12 +69,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -92,14 +92,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,38 +108,38 @@ main (int argc, char *argv [])
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
                                             root_poa.in ());
       TAO_EC_Event_Channel ec_impl (attr);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in (), ACE_TRY_ENV);
+        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
         {
-	  FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_file_name),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", str.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_file_name),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", str.in ());
+          ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&ec_impl, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        root_poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -162,14 +162,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_file_name = get_opts.optarg;
-	break;
+        ior_file_name = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <ior_file_name>"
+                           "-o <ior_file_name>"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index e77bd596f8c..5955b95febc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->EC_Driver::execute_test (ACE_TRY_ENV);
+  this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index fc1cfeac8b8..8d8b222b3b2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -44,7 +44,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the throughpution flags
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);