Merged corba-env-clean branch.

17 files changed, 190 insertions, 195 deletions

diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 03988761554..bfa2b4e8bd8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -11,8 +11,8 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr,
-                      CORBA::Environment&)
+                      RtecUDPAdmin::UDP_Addr_out addr
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index a75f2a774ce..fc3610771df 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,8 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr,
-                         CORBA::Environment&)
+                         RtecUDPAdmin::UDP_Addr_out addr
+                         TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index eef1b14038d..c6e79b3ef6b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -12,15 +12,15 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                   TAO_ENV_ARG_DECL)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple subscription, but usually the helper classes in
@@ -39,18 +39,18 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos,
-                                       ACE_TRY_ENV);
+  this->proxy_->connect_push_consumer (me.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,20 +62,20 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   // Deactivate the object
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -95,7 +95,7 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 69bd65ab206..c71328b15d4 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -37,19 +37,19 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                TAO_ENV_ARG_DECL);
   // Connect to the Event Channel
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     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));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 187b799e1ae..3e1348e7544 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 #include "Consumer.h"
 #include "Supplier.h"
 #include "AddrServer.h"
@@ -11,7 +12,9 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(EC_Examples, MCast, "$Id$")
+ACE_RCSID (EC_Examples,
+           MCast,
+           "$Id$")
 
 const char *udp_mcast_address =
     ACE_DEFAULT_MULTICAST_ADDR ":10001";
@@ -34,32 +37,24 @@ main (int argc, char* argv[])
   //
   // and defined in:
   //
-  // $ACE_ROOT/ace/CORBA_macros.h
+  // $ACE_ROOT/TAO/tao/orbconf.h - for Environment parameter definitions
+  //
+  // $ACE_ROOT/ace/CORBA_macros.h - for try/catch et al.
   //
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_TRY_ENV argument.
+  // and avoid the TAO_ENV_SINGLE_ARG_PARAMETER argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  // This would be OK except for the fact that event channel library
-  // is compiled with support for platforms without exceptions, so
-  // some of the classes (the consumers and suppliers), must receive
-  // the extra CORBA::Environment argument.
-  // In platforms with native C++ exception support the argument must
-  // be present, but it can be ignored, and the standard C++ exception
-  // mechanisms can be used instead.
-  // Still we are workin on some way to avoid the extra argument
-  // altogether, at least for platforms that do not require it.
-  //
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments, you usually want to do this after
@@ -77,15 +72,15 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        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;
 
       // **************** THAT COMPLETS THE ORB SETUP
@@ -108,14 +103,14 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -152,7 +147,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_TRY_ENV);
+        as_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We need a local socket to send the data, open it and check
@@ -168,8 +163,8 @@ main (int argc, char* argv[])
       TAO_ECG_UDP_Sender sender;
       sender.init (event_channel.in (),
                    address_server.in (),
-                   &endpoint,
-                   ACE_TRY_ENV);
+                   &endpoint
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now we connect the sender as a consumer of events, it will
@@ -184,7 +179,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender.open (sub, ACE_TRY_ENV);
+      sender.open (sub TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To receive events we need to setup an event handler:
@@ -201,8 +196,8 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      int r = mcast_eh.open (event_channel.in (),
-                             ACE_TRY_ENV);
+      int r = mcast_eh.open (event_channel.in ()
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -225,8 +220,8 @@ main (int argc, char* argv[])
                      address_server.in (),
                      orb->orb_core ()->reactor (),
                      expire,
-                     max_expiration_count,
-                     ACE_TRY_ENV);
+                     max_expiration_count
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The Receiver is also a supplier of events.  The exact type of
@@ -246,7 +241,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver.open (pub, ACE_TRY_ENV);
+      receiver.open (pub TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
@@ -257,19 +252,19 @@ main (int argc, char* argv[])
       // channel
       Consumer consumer;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer.connect (consumer_admin.in (),
-                        ACE_TRY_ENV);
+      consumer.connect (consumer_admin.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.connect (supplier_admin.in (),
-                        ACE_TRY_ENV);
+      supplier.connect (supplier_admin.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLIENT SETUP
@@ -282,7 +277,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 1000; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_TRY_ENV);
+            orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (there_is_work)
             {
@@ -291,12 +286,12 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv, ACE_TRY_ENV);
+              orb->perform_work (tv TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
-          supplier.perform_push (ACE_TRY_ENV);
+          supplier.perform_push (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -305,16 +300,16 @@ main (int argc, char* argv[])
       // **************** HERE STARTS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (ACE_TRY_ENV);
+      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer.disconnect (ACE_TRY_ENV);
+      consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now let us close the Receiver
-      receiver.close (ACE_TRY_ENV);
+      receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      r = mcast_eh.close (ACE_TRY_ENV);
+      r = mcast_eh.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -323,13 +318,13 @@ main (int argc, char* argv[])
         }
 
       // And also close the sender of events
-      sender.close (ACE_TRY_ENV);
+      sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivating the event channel implementation is not strictly
@@ -341,24 +336,24 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_TRY_ENV);
+          ec_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl, ACE_TRY_ENV);
+          poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Deactivate the object
-        poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+        poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Finally destroy the ORB
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index a23d243809e..1904326e03e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -11,15 +11,15 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                   TAO_ENV_ARG_DECL)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple publication, but usually the helper classes in
@@ -33,18 +33,18 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos,
-                                       ACE_TRY_ENV);
+  this->proxy_->connect_push_supplier (me.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Disconnect from the EC
   ACE_TRY
     {
-      this->proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -53,17 +53,17 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
   ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
+Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -75,7 +75,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event, ACE_TRY_ENV);
+      this->proxy_->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,7 +85,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 35743ec5bb4..a8d6c6ff31d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -38,19 +38,19 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
   // Connect to the event channel
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
-  void perform_push (CORBA::Environment &ACE_TRY_ENV);
+  void perform_push (TAO_ENV_SINGLE_ARG_DECL);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 8b5f1b76dfa..4793a20ab13 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -9,8 +9,8 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 58c7e18af17..20c1ffad011 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,10 +44,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     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));
   // The skeleton methods.
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 5ec946fc760..a5e70795367 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -30,12 +30,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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 (parse_args (argc, argv) == -1)
@@ -46,15 +46,15 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        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;
 
       // ****************************************************************
@@ -62,11 +62,11 @@ main (int argc, char* argv[])
 #if 0
       // Obtain a reference to the naming service...
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -93,7 +93,7 @@ main (int argc, char* argv[])
         }
 
       RtecScheduler::Scheduler_var scheduler =
-        sched_impl->_this (ACE_TRY_ENV);
+        sched_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if 0
@@ -105,8 +105,8 @@ main (int argc, char* argv[])
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in (),
-                              ACE_TRY_ENV);
+      naming_context->rebind (schedule_name, scheduler.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -121,7 +121,7 @@ main (int argc, char* argv[])
                                            &module_factory);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        event_channel_impl._this (ACE_TRY_ENV);
+        event_channel_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
 
@@ -131,12 +131,12 @@ main (int argc, char* argv[])
 
       TAO_EC_Event_Channel ec_impl (attributes);
       ACE_DEBUG ((LM_DEBUG, "activating EC\n"));
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -148,7 +148,7 @@ main (int argc, char* argv[])
       Consumer consumer_impl;
 
       RtecScheduler::handle_t consumer_rt_info1 =
-        scheduler->create ("consumer_event_1", ACE_TRY_ENV);
+        scheduler->create ("consumer_event_1" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 1 is 2
@@ -163,12 +163,12 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t consumer_rt_info2 =
-        scheduler->create ("consumer_event_2", ACE_TRY_ENV);
+        scheduler->create ("consumer_event_2" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 2 is 1
@@ -182,8 +182,8 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ConsumerQOS_Factory consumer_qos;
@@ -197,21 +197,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy =
-        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 =
-        consumer_impl._this (ACE_TRY_ENV);
+        consumer_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
       supplier_proxy->connect_push_consumer (consumer.in (),
-                                             consumer_qos.get_ConsumerQOS (),
-                                             ACE_TRY_ENV);
+                                             consumer_qos.get_ConsumerQOS ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
 
@@ -220,7 +220,7 @@ main (int argc, char* argv[])
       Supplier supplier_impl;
 
       RtecScheduler::handle_t supplier_rt_info1 =
-        scheduler->create ("supplier_event_1", ACE_TRY_ENV);
+        scheduler->create ("supplier_event_1" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -239,12 +239,12 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t supplier_rt_info2 =
-        scheduler->create ("supplier_event_2", ACE_TRY_ENV);
+        scheduler->create ("supplier_event_2" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -262,8 +262,8 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::EventSourceID supplier_id = 1;
@@ -279,21 +279,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy =
-        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 =
-        supplier_impl._this (ACE_TRY_ENV);
+        supplier_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
       consumer_proxy->connect_push_supplier (supplier.in (),
-                                             supplier_qos.get_SupplierQOS (),
-                                             ACE_TRY_ENV);
+                                             supplier_qos.get_SupplierQOS ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
 
@@ -329,8 +329,8 @@ main (int argc, char* argv[])
                                          max_os_priority,
                                          infos.out (),
                                          configs.out (),
-                                         anomalies.out (),
-                                         ACE_TRY_ENV);
+                                         anomalies.out ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Dump the schedule to a file..
@@ -362,12 +362,12 @@ main (int argc, char* argv[])
         {
           if (i % 2 == 0)
             {
-              consumer_proxy->push (event1, ACE_TRY_ENV);
+              consumer_proxy->push (event1 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
-              consumer_proxy->push (event2, ACE_TRY_ENV);
+              consumer_proxy->push (event2 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 921f5d7c1bf..f60d585f1ec 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -9,7 +9,7 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index a75bdd5b416..e6139801c49 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,7 +44,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index dc8e1a26b29..d0d81303d5c 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -24,15 +24,15 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Do *NOT* make a copy because we don't want the ORB to outlive 
+      // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
@@ -44,40 +44,40 @@ Consumer::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var 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 =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -94,11 +94,11 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      supplier->connect_push_consumer (consumer.in (), qos,
-                                       ACE_TRY_ENV);
+      supplier->connect_push_consumer (consumer.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Wait for events, using work_pending()/perform_work() may help 
+      // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
 
@@ -119,8 +119,8 @@ Consumer::run (int argc, char* argv[])
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -140,13 +140,13 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 352096048f1..e7dfda0c32a 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,10 +41,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     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));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index 5df20ad8a45..e1631f7dcae 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -15,12 +15,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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 (parse_args (argc, argv) == -1)
@@ -31,30 +31,30 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        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;
 
       TAO_EC_Event_Channel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in (), ACE_TRY_ENV);
+        orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 831128a3620..32ea062d450 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -23,12 +23,12 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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 (argc <= 1)
@@ -39,40 +39,40 @@ Supplier::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var 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 =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -84,8 +84,8 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      consumer->connect_push_supplier (supplier.in (), qos,
-                                       ACE_TRY_ENV);
+      consumer->connect_push_supplier (supplier.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Push the events...
@@ -99,28 +99,28 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event, ACE_TRY_ENV);
+          consumer->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the EC....
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA
-      poa->destroy (1, 0, ACE_TRY_ENV);
+      poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index 7410fc2d03b..72a72f74395 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,7 +41,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.