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

8 files changed, 28 insertions, 28 deletions

diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 727078a3c98..0639cfcefeb 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void)
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MCast_Server_i::connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index e626d3265b6..1056dc77929 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,7 +11,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index e47a63655c0..7a79bec47bc 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -5,7 +5,7 @@
 int main (int argc, char *argv [])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -13,7 +13,7 @@ int main (int argc, char *argv [])
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index b1110e009cb..a07113d7be3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -16,7 +16,7 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 int
 ior_mcast_Client_i::init (int& argc,
                           char *argv[]
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
 
   ACE_TRY
@@ -26,11 +26,11 @@ ior_mcast_Client_i::init (int& argc,
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var mcast_server_object =
-        orb->resolve_initial_references ("MCASTServer" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mcast_server_object.in ()))
@@ -39,7 +39,7 @@ ior_mcast_Client_i::init (int& argc,
                           -1);
 
       MCast::Server_var mcast_srvr =
-        MCast::Server::_narrow (mcast_server_object.in () TAO_ENV_ARG_PARAMETER);
+        MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mcast_srvr.in ()))
@@ -49,7 +49,7 @@ ior_mcast_Client_i::init (int& argc,
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        mcast_srvr->connect_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+        mcast_srvr->connect_server (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index d28da2f6c73..b001a1b6e55 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -20,10 +20,10 @@ class ior_mcast_Client_i
   ior_mcast_Client_i (void);
   ~ior_mcast_Client_i (void);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] TAO_ENV_ARG_DECL);
+  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index f25de786656..829cb75d232 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -4,14 +4,14 @@
 
 int main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_i svr_i;
 
       int init_result;
 
-      init_result = svr_i.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index da83e55d580..365034c059e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -24,7 +24,7 @@ Server_i::~Server_i (void)
 int
 Server_i::init (int &argc,
                 char **&argv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -36,26 +36,26 @@ Server_i::init (int &argc,
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the correct reference.
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager.
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior;
@@ -68,11 +68,11 @@ Server_i::init (int &argc,
         server_i._this ();
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (adapter.in ()))
@@ -83,20 +83,20 @@ Server_i::init (int &argc,
         {
           ior =
             this->orb_->object_to_string (mcast_server.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          adapter->bind ("MCASTServer", ior.in () TAO_ENV_ARG_PARAMETER);
+          adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Enable such that the server can listen for multicast requests
       // at the specified address.
       this->enable_multicast (ior.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Destroy the POA, waiting until the destruction terminates.
@@ -115,7 +115,7 @@ Server_i::init (int &argc,
 
 int
 Server_i::enable_multicast (const char *ior
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 77b16b86153..17b13ffe207 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -18,13 +18,13 @@ class Server_i
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv TAO_ENV_ARG_DECL_NOT_USED);
+  int init (int &argc, char **&argv ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize the server multicast.
 
  private:
 
   int enable_multicast (const char *ior
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // Sets the IOR_Multicast class to listen for multicast requests
   // for this server.