1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index 66cd569662c..57f7ca35020 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -99,7 +99,7 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   char str [255];
   // Initialize the ORB
@@ -110,7 +110,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
 
-                                            0, ACE_TRY_ENV);
+                                            0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the location of the
@@ -132,8 +132,8 @@ main (int argc, char **argv)
                       "CORBA::ORB::string_to_object");
 
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (IOR,
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (IOR
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str,
@@ -141,8 +141,8 @@ main (int argc, char **argv)
 
       // Narrow the object reference to a Database::Agent
       Database::Agent_var database_agent =
-        Database::Agent::_narrow (object.in (),
-                                  ACE_TRY_ENV);
+        Database::Agent::_narrow (object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Database::NVPairSequence employee_attributes (2);
@@ -168,15 +168,15 @@ main (int argc, char **argv)
       Database::Entry_var entry =
         database_agent->create_entry ("irfan",
                                       "Employee",
-                                      employee_attributes,
-                                      ACE_TRY_ENV);
+                                      employee_attributes
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Employee::_narrow");
 
       Database::Employee_var employee =
-        Database::Employee::_narrow (entry.in (),
-                                     ACE_TRY_ENV);
+        Database::Employee::_narrow (entry.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*
@@ -189,27 +189,27 @@ main (int argc, char **argv)
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666, ACE_TRY_ENV);
+      employee->id (666 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
       ACE_OS::strcpy (str, "Database::Entry::find");
       // Find the employee
       entry = database_agent->find_entry ("irfan",
-                                          "Employee",
-                                          ACE_TRY_ENV);
+                                          "Employee"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Entry::destroy");
       // Destroy the employee
       database_agent->destroy_entry ("irfan",
-                                     "Employee",
-                                     ACE_TRY_ENV);
+                                     "Employee"
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (shutdown_server)
         {
-          database_agent->shutdown (ACE_TRY_ENV);
+          database_agent->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }