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

4 files changed, 25 insertions, 25 deletions

diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 0358a8aac7c..964d9dc23df 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -49,17 +49,17 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Simple_Server_ptr server
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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;
 
       if (parse_args (argc, argv) != 0)
@@ -67,23 +67,23 @@ main (int argc, char *argv[])
 
       // Primary server
       CORBA::Object_var object_primary =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Secondary server
       CORBA::Object_var object_secondary =
-        orb->string_to_object (name TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA_Object_ptr IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                          0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
       iors [0] = object_primary;
       iors [1] = object_secondary;
 
-      CORBA_Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+      CORBA_Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Combined IOR stuff
       Simple_Server_var server =
-        Simple_Server::_narrow (merged.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
 }
 
 void run_test (Simple_Server_ptr server
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   for (int loop = 0; loop < 10; loop++)
     {
@@ -129,7 +129,7 @@ void run_test (Simple_Server_ptr server
           // Make a remote call
           cout << "Remote call "<<endl;
           CORBA::Long ret=
-            server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
+            server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           cout << "The retval is .. " << ret << endl;
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index ac965b990ac..c2481225b94 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
                           1);
 
       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;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
         }
 
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index bbf7e7c0709..8135b51217d 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 CORBA::Long
-Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -28,7 +28,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index f839fd3c6b4..f6d4df6ebee 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Long remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: