1 files changed, 10 insertions, 10 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 98d415865df..3a061df9629 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -113,8 +113,8 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the video mmdevice object with the ORB
@@ -129,11 +129,11 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_TRY_ENV);
+        mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in (), ACE_TRY_ENV);
+        orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -161,18 +161,18 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_TRY_ENV);
+        ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_TRY_ENV);
+        pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mmdevice->add_fdev (ping_fdev.in (), ACE_TRY_ENV);
+      mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in (), ACE_TRY_ENV);
+          mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -190,7 +190,7 @@ int main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;