1 files changed, 14 insertions, 14 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 1856b71f12c..6ade36d8ef6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -119,7 +119,7 @@ Receiver_Callback::handle_destroy (void)
       ACE_TRY_NEW_ENV
         {
           TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -190,7 +190,7 @@ Receiver::parse_args (int argc,
 int
 Receiver::init (int argc,
                 char ** argv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -230,7 +230,7 @@ Receiver::init (int argc,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -249,7 +249,7 @@ Receiver::init (int argc,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -279,29 +279,29 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make sure we have a valid <output_file>
@@ -320,23 +320,23 @@ main (int argc,
       int result =
         RECEIVER::instance ()->init (argc,
                                      argv
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //        // Start sending data.
-      //        result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //        result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       //        ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY