diff options
Diffstat (limited to 'TAO/tao/RTCORBA/RT_ORB.cpp')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_ORB.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 037fa0238ba..410cdedadfd 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -34,41 +34,41 @@ TAO_RT_ORB::~TAO_RT_ORB (void) } RTCORBA::Mutex_ptr -TAO_RT_ORB::create_mutex (CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::create_mutex (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->mutex_mgr_.create_mutex (ACE_TRY_ENV); + return this->mutex_mgr_.create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->mutex_mgr_.destroy_mutex (mutex, - ACE_TRY_ENV); + this->mutex_mgr_.destroy_mutex (mutex + TAO_ENV_ARG_PARAMETER); } RTCORBA::Mutex_ptr TAO_RT_ORB::create_named_mutex (const char *name, - CORBA::Boolean_out created_flag, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out created_flag + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->mutex_mgr_.create_named_mutex (name, - created_flag, - ACE_TRY_ENV); + created_flag + TAO_ENV_ARG_PARAMETER); } RTCORBA::Mutex_ptr -TAO_RT_ORB::open_named_mutex (const char *name, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::open_named_mutex (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { - return this->mutex_mgr_.open_named_mutex (name, - ACE_TRY_ENV); + return this->mutex_mgr_.open_named_mutex (name + TAO_ENV_ARG_PARAMETER); } //////////////////////////////////////////////////////////////////////////////// @@ -82,7 +82,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void) } RTCORBA::Mutex_ptr -TAO_Named_RT_Mutex_Manager::create_mutex (CORBA::Environment &ACE_TRY_ENV) +TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *mutex = 0; @@ -102,8 +102,8 @@ TAO_Named_RT_Mutex_Manager::create_mutex (CORBA::Environment &ACE_TRY_ENV) // as also indicated by the comment below. #if (TAO_HAS_NAMED_RT_MUTEXES == 1) void -TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex, - CORBA::Environment &ACE_TRY_ENV) +TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = @@ -131,8 +131,8 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex, } #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ void -TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr, - CORBA::Environment &) +TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -140,8 +140,8 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr, RTCORBA::Mutex_ptr TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, - CORBA::Boolean_out created_flag, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out created_flag + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_NAMED_RT_MUTEXES == 1) @@ -198,8 +198,8 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name, } RTCORBA::Mutex_ptr -TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound)) { @@ -234,8 +234,8 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size, CORBA::Boolean keep_alive, CORBA::Boolean dont_route, - CORBA::Boolean no_delay, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean no_delay + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException )) { TAO_TCP_Properties *tmp; @@ -259,8 +259,8 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, RTCORBA::Priority default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong max_request_buffer_size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool (stacksize, @@ -269,8 +269,8 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, default_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - ACE_TRY_ENV); + max_request_buffer_size + TAO_ENV_ARG_PARAMETER); } RTCORBA::ThreadpoolId @@ -279,8 +279,8 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong max_request_buffer_size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->tp_manager_->create_threadpool_with_lanes (stacksize, @@ -288,24 +288,24 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - ACE_TRY_ENV); + max_request_buffer_size + TAO_ENV_ARG_PARAMETER); } void -TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::InvalidThreadpool)) { - this->tp_manager_->destroy_threadpool (threadpool, - ACE_TRY_ENV); + this->tp_manager_->destroy_threadpool (threadpool + TAO_ENV_ARG_PARAMETER); } RTCORBA::PriorityModelPolicy_ptr TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, - RTCORBA::Priority server_priority, - CORBA::Environment &ACE_TRY_ENV) + RTCORBA::Priority server_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityModelPolicy *tmp; @@ -319,8 +319,8 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model, } RTCORBA::ThreadpoolPolicy_ptr -TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ThreadpoolPolicy *tmp; @@ -335,8 +335,8 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool, RTCORBA::PriorityBandedConnectionPolicy_ptr TAO_RT_ORB::create_priority_banded_connection_policy (const - RTCORBA::PriorityBands & priority_bands, - CORBA::Environment &ACE_TRY_ENV) + RTCORBA::PriorityBands & priority_bands + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PriorityBandedConnectionPolicy *tmp; @@ -350,7 +350,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const } RTCORBA::PrivateConnectionPolicy_ptr -TAO_RT_ORB::create_private_connection_policy (CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_PrivateConnectionPolicy *tmp; @@ -364,8 +364,8 @@ TAO_RT_ORB::create_private_connection_policy (CORBA::Environment &ACE_TRY_ENV) } RTCORBA::ServerProtocolPolicy_ptr -TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ServerProtocolPolicy *tmp; @@ -379,8 +379,8 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco } RTCORBA::ClientProtocolPolicy_ptr -TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ClientProtocolPolicy *tmp; |