1 files changed, 17 insertions, 17 deletions

diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index 3d0a86cc098..f3dcd132443 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -38,8 +38,8 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 'd':
-	TAO_debug_level++;
-	break;
+        TAO_debug_level++;
+        break;
       case 'k':
         iorfile = get_opts.optarg;
         break;
@@ -54,8 +54,8 @@ parse_args (int argc, char **argv)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            "[-k <iorfile>]"
-			   "[-f <filename>]"
-			   "[-m <message>]"
+                           "[-f <filename>]"
+                           "[-m <message>]"
                            "\n",
                            argv [0]),
                           -1);
@@ -72,12 +72,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
@@ -105,19 +105,19 @@ main (int argc, char **argv)
       ior_buffer.alloc ()-> free (data);
       ACE_OS::close (input_file);
 
-      CORBA::Object_var object = orb->string_to_object (ior.c_str (),
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (ior.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a File::System
-      File::System_var file_system = File::System::_narrow (object.in (),
-                                                            ACE_TRY_ENV);
+      File::System_var file_system = File::System::_narrow (object.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
-                                                   O_CREAT | O_RDWR,
-                                                   ACE_TRY_ENV);
+                                                   O_CREAT | O_RDWR
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int message_length = ACE_OS::strlen (message) + 1;
@@ -126,16 +126,16 @@ main (int argc, char **argv)
       File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
 
       // write the message to the file
-      fd->write (data_sent, ACE_TRY_ENV);
+      fd->write (data_sent TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //seek to the beginning of the file
-      fd->lseek (0, SEEK_SET, ACE_TRY_ENV);
+      fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Read back the written message
-      File::Descriptor::DataBuffer_var data_received = fd->read (message_length,
-                                                                 ACE_TRY_ENV);
+      File::Descriptor::DataBuffer_var data_received = fd->read (message_length
+                                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *result = (char *) &data_received[0];
@@ -145,7 +145,7 @@ main (int argc, char **argv)
                  result));
 
       // close the file
-      fd->destroy (ACE_TRY_ENV);
+      fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY