Merged corba-env-clean branch.

1 files changed, 7 insertions, 7 deletions

diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 576e662898a..403530d1b21 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -7,24 +7,24 @@ ACE_RCSID (tests, server, "$Id$")
 int main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
-      object = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      object = 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_var poa = PortableServer::POA::_narrow(object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Get the POAManager
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_TRY_ENV);
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant.
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 
       // Now we stringfy the object reference.
       CORBA::String_var ior =
-        orb->object_to_string (bottom.in (), ACE_TRY_ENV);
+        orb->object_to_string (bottom.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POAManager
-      poa_manager->activate(ACE_TRY_ENV);
+      poa_manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run();