diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 2df60ade3e3..c133ea05fe8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *, { CORBA::Any_ptr streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -106,7 +106,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, ACE_DECLARE_NEW_CORBA_ENV; // Initiate the modifying of the qos for the flows. - this->streamctrl_->modify_QoS (qos, flow_spec TAO_ENV_ARG_PARAMETER); + this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -146,7 +146,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 @@ -175,7 +175,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -194,7 +194,7 @@ Receiver::init (int, 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. @@ -213,7 +213,7 @@ Receiver::init (int, // 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; @@ -250,7 +250,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -258,31 +258,31 @@ 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); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -309,19 +309,19 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_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 |