1 files changed, 7 insertions, 7 deletions

diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index fa7d17b334e..27fef1387c5 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name,
   ACE_Time_Value now (ACE_OS::gettimeofday ());
   ACE_OS::srand ((unsigned int) now.sec () );
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name,
                                            new Temperature_impl (temperature)));
       t_e->origin_id_ (KITCHEN);
       t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       temperature = random_number (25,30);
       t_e = new Temperature_impl (temperature);
       t_e->origin_id_ (BATHROOM);
       t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Point point = { random_number (0,4),
@@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name,
                                         new Position_impl (point)));
       p_e->origin_id_ (JONAS);
       p_e->do_print ();
-      checkpoint->put_event (p_e, ACE_TRY_ENV);
+      checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name,
                                        new Log_Msg_impl (urgent, a_text)));
       l_e->origin_id_ (JONAS);
       l_e->do_print ();
-      checkpoint->put_event (l_e, ACE_TRY_ENV);
+      checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
 
-      Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV));
+      Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       for (Event_List_Iterator i (list); i.next (); i.advance ())
@@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name,
         }
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_TRY_ENV);
+        checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }