diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 8919ca23faf..fe0fb2884ad 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -52,8 +52,8 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) // and the remaining calls will fail automagically int TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */, - AVStreams::VDev_ptr & /* vdev */, - CORBA::Environment &) + AVStreams::VDev_ptr & /* vdev */ + TAO_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating A endpoint\n"), @@ -66,8 +66,8 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_ // and the remaining calls will fail automagically int TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */, - AVStreams::VDev_ptr & /*vdev */, - CORBA::Environment &) + AVStreams::VDev_ptr & /*vdev */ + TAO_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating B endpoint\n"), @@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) "remove"), -1); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Get ourselves a Naming service - this->bind_to_naming_service (ACE_TRY_ENV); + this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the stream endpoint created by the child from the naming service - this->get_stream_endpoint (ACE_TRY_ENV); + this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Vdev created by the child from the naming service - this->get_vdev (ACE_TRY_ENV); + this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Get ourselves a Naming service reference int -TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC return 0; CORBA::Object_var naming_obj = - TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService", ACE_TRY_ENV); + TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -199,8 +199,8 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC " (%P|%t) Unable to resolve the Name Service.\n"), -1); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -235,14 +235,14 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV) // Get the CORBA::Object CORBA::Object_var vdev = - this->naming_context_->resolve (VDev_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (VDev_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it this->vdev_ = - AVStreams::VDev::_narrow (vdev.in (), - ACE_TRY_ENV); + AVStreams::VDev::_narrow (vdev.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if valid @@ -279,8 +279,8 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) // the "A" type endpoint creator int TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL_NOT_USED) { // use the baseclass activate if (this->activate () == -1) @@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s // Gets the stream endpoint object reference from the naming service int -TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -318,14 +318,14 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE // Get the CORBA::Object CORBA::Object_var stream_endpoint_a = - this->naming_context_->resolve (Stream_Endpoint_A_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (Stream_Endpoint_A_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_a_ = - AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in (), - ACE_TRY_ENV); + AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity @@ -362,8 +362,8 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) // Creates and returns a "B" type endpoint int TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -373,8 +373,8 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s -1); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_, - ACE_TRY_ENV))); + TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_ + TAO_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; stream_endpoint = this->stream_endpoint_b_; vdev = this->vdev_; @@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s // Gets the B type stream_endpoint from the Naming service int -TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -412,14 +412,14 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE // Get the CORBA::Object reference CORBA::Object_var stream_endpoint_b = - this->naming_context_->resolve (Stream_Endpoint_B_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (Stream_Endpoint_B_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_b_ = - AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in (), - ACE_TRY_ENV); + AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity |