ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

10 files changed, 72 insertions, 72 deletions

diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 60a43593f69..6b6b332a9cc 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -30,7 +30,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
                                   Test::Session_List &session_list
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -44,13 +44,13 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               thread_count,
                               message_count,
                               this->peer_count_
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
+Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
@@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -72,7 +72,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 48f5180eb78..0c8211c09b2 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -36,14 +36,14 @@ public:
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
                             Test::Session_List &session_list
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL);
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index c4bd8a20639..3ffb1bf388f 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -21,7 +21,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl;
@@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control,
   ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +47,5 @@ Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 41ab681be6f..8069d439665 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -33,9 +33,9 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index dc1ed674ba4..f2abce4d041 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -36,7 +36,7 @@ Session::svc (void)
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -53,7 +53,7 @@ Session::svc (void)
       CORBA::ULong session_count =
         this->other_sessions_.length ();
 
-      this->validate_connections (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i != this->message_count_; ++i)
@@ -70,7 +70,7 @@ Session::svc (void)
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
               this->other_sessions_[j]->receive_payload (payload
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -83,7 +83,7 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1 TAO_ENV_ARG_PARAMETER);
+      this->terminate (1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -97,7 +97,7 @@ Session::svc (void)
 }
 
 void
-Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
+Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -107,7 +107,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_TRY
             {
-              this->other_sessions_[j]->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY {} ACE_ENDTRY;
@@ -117,7 +117,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Session::start (const Test::Session_List &other_sessions
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
@@ -138,12 +138,12 @@ Session::start (const Test::Session_List &other_sessions
         // access to this object....
         ACE_TRY
           {
-            this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
               }
             else
@@ -170,17 +170,17 @@ Session::start (const Test::Session_List &other_sessions
   }
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0 TAO_ENV_ARG_PARAMETER);
+  this->terminate (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Session::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+Session::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Session::receive_payload (const Test::Payload &the_payload
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -217,23 +217,23 @@ Session::receive_payload (const Test::Payload &the_payload
     if (this->more_work ())
       return;
   }
-  this->terminate (1 TAO_ENV_ARG_PARAMETER);
+  this->terminate (1 ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
-Session::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Session::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -250,14 +250,14 @@ Session::more_work (void) const
 
 void
 Session::terminate (CORBA::Boolean success
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   ACE_TRY_EX(GLOBAL)
     {
       this->control_->session_finished (success
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GLOBAL);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 62dcd896fa5..ff450c1ff47 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -37,26 +37,26 @@ public:
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_payload (const Test::Payload &the_payload
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
   void terminate (CORBA::Boolean success
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
@@ -64,7 +64,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_connections (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 62a77e985b3..5b5c2e8ee44 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -42,7 +42,7 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 3f3dfcab3f9..a574ec4134f 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -35,7 +35,7 @@ public:
 
   // = The skeleton methods
   virtual void session_finished (CORBA::Boolean success
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 1b90a459f6f..ed04da64896 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -86,24 +86,24 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER);
+      coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 20111f3eabe..183124a1e5d 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -64,15 +64,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Session_List session_list;
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
                                              thread_count,
                                              message_count,
                                              session_list
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
             }
 
           session_list[j]->start (other_sessions
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -195,18 +195,18 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
-      coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY