diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent')
31 files changed, 221 insertions, 492 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index ac6dce9b64a..f04f3f1beb7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -39,13 +39,11 @@ TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event this->push_admin_.for_each (&push_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_CEC_Propagate_Event_Pull pull_worker (event); this->pull_admin_.for_each (&pull_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -91,31 +89,29 @@ TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier } void -TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::shutdown (void) { - this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->push_admin_.shutdown (); - this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->pull_admin_.shutdown (); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ConsumerAdmin::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index aba60f615c6..c75e0c9a4bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -47,7 +47,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin +class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin::ConsumerAdmin { public: @@ -88,18 +88,18 @@ public: /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 5911d5c109d..8db5cf88fa2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -43,8 +43,7 @@ TAO_CEC_Dispatching_Task::svc (void) continue; } - int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + int result = command->execute (); ACE_Message_Block::release (mb); @@ -116,7 +115,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void) // **************************************************************** int -TAO_CEC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_Shutdown_Task_Command::execute (void) { return -1; } @@ -129,10 +128,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void) } int -TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_Push_Command::execute (void) { this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } @@ -145,10 +143,9 @@ TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void) } int -TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_Invoke_Command::execute (void) { this->proxy_->invoke_to_consumer (this->typed_event_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 5c213395a89..7d987927f44 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -87,7 +87,7 @@ public: virtual ~TAO_CEC_Dispatch_Command (void); /// Command callback - virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (void) = 0; }; // **************************************************************** @@ -99,7 +99,7 @@ public: TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (void); }; // **************************************************************** @@ -117,7 +117,7 @@ public: virtual ~TAO_CEC_Push_Command (void); /// Command callback - virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (void); private: /// The proxy @@ -143,7 +143,7 @@ public: virtual ~TAO_CEC_Invoke_Command (void); /// Command callback - virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (void); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index f00965a58b2..810d90abe5f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -29,14 +29,13 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0) { this->is_a (request ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { CORBA::NVList_ptr list; // Get the operation paramter information from the IFR cache. - TAO_CEC_Operation_Params *oper_params = + TAO_CEC_Operation_Params *oper_params = this->typed_event_channel_->find_from_ifr_cache (request->operation () ); if (oper_params == 0) @@ -48,25 +47,21 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request } this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { // Populate the NVList from the parameter information. this->typed_event_channel_->create_operation_list (oper_params, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - + // Get the operation arguments. This ahould demarshal correctly. request->arguments (list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Populate the TypedEvent with the list and operation name. TAO_CEC_TypedEvent typed_event (list, request->operation () ); // Pass the TypedEvent to the TypedProxyPushConsumer this->typed_pp_consumer_->invoke (typed_event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -81,7 +76,7 @@ TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::O } PortableServer::POA_ptr -TAO_CEC_DynamicImplementationServer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_DynamicImplementationServer::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -93,7 +88,6 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request CORBA::NVList_ptr list; this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Any any_1; any_1._tao_set_typecode(CORBA::_tc_string); @@ -102,14 +96,11 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request any_1, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - request->arguments (list + request->arguments (list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Any_ptr ap = nv->value (); const char *value; @@ -123,8 +114,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request } const char *object_id = - CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::_tc_Object->id (); if (TAO_debug_level >= 10) { @@ -153,27 +143,26 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request ACE_TEXT ("***** is_a using base interface %s *****\n"), this->typed_event_channel_->base_interfaces (base) )); } - + if (ACE_OS::strcmp (value, this->typed_event_channel_->base_interfaces (base) ) == 0) { result = 1; } } } - + if (TAO_debug_level >= 10) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("***** is_a returning %d *****\n"), result)); } - + CORBA::Any result_any; CORBA::Any::from_boolean from_boolean (result); result_any <<= from_boolean; request->set_result (result_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 6d85505f431..6101bf34738 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) } void -TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_EventChannel::activate (void) { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::shutdown (void) { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -91,28 +91,20 @@ TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->consumer_admin_->_default_POA (); PortableServer::ObjectId_var consumer_id = consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->supplier_admin_->_default_POA (); PortableServer::ObjectId_var supplier_id = supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->supplier_admin_->shutdown (); - this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->consumer_admin_->shutdown (); } void @@ -120,7 +112,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -128,7 +119,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -136,7 +126,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -144,7 +133,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -152,7 +140,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -160,7 +147,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer ACE_ENV_ARG_DECL) { this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -168,7 +154,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -176,7 +161,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -184,7 +168,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -192,7 +175,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -200,7 +182,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -208,28 +189,27 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier ACE_ENV_ARG_DECL) { this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (); } void -TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (); } CORBA::Policy_ptr TAO_CEC_EventChannel::create_roundtrip_timeout_policy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index e7ac5d173e2..81afadc878c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -133,11 +133,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (void); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (void); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching (void) const; @@ -243,17 +243,17 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index e9a9e726717..202b473face 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -63,11 +63,9 @@ TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[]) // ORB initialization boiler plate... this->orb_= CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (obj.in() )) return -1; @@ -193,15 +191,11 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // POA initialization and activation ... CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->the_POAManager (); + poa_manager->activate (); // **************************************************************** @@ -226,18 +220,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->factory_, this->terminate_flag_); - this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_impl_->activate (); CosEventChannelAdmin::EventChannel_var event_channel = - this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_impl_->_this (); if (ior_file != 0) { CORBA::String_var ior = orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (iorf != 0) @@ -268,12 +259,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, CORBA::Object_var obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->naming_context_ = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->channel_name_.length (1); this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); @@ -283,14 +272,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->naming_context_->rebind (this->channel_name_, event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { this->naming_context_->bind (this->channel_name_, event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } return CosEventChannelAdmin::EventChannel::_duplicate (event_channel.in () ); @@ -313,7 +300,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, CORBA::Object_var ifr_obj_var = orb->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil(ifr_obj_var.in () )) { @@ -328,7 +314,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil(interface_repository.in () )) { @@ -367,18 +352,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->factory_, this->terminate_flag_); - this->typed_ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->typed_ec_impl_->activate (); CosTypedEventChannelAdmin::TypedEventChannel_var event_channel = - this->typed_ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->typed_ec_impl_->_this (); if (ior_file != 0) { CORBA::String_var ior = orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (iorf != 0) @@ -409,12 +391,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, CORBA::Object_var obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->naming_context_ = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->channel_name_.length (1); this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); @@ -424,14 +404,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->naming_context_->rebind (this->channel_name_, event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { this->naming_context_->bind (this->channel_name_, event_channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } return CosTypedEventChannelAdmin::TypedEventChannel::_duplicate (event_channel.in () ); @@ -461,38 +439,30 @@ TAO_CEC_Event_Loader::fini (void) if(this->typed_ec_impl_) { // Release the resources of the Typed Event Channel - this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->typed_ec_impl_->destroy (); // Deactivate the Typed EC // This will raise an exception if destroy == 1 PortableServer::POA_var t_poa = - this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->typed_ec_impl_->_default_POA (); PortableServer::ObjectId_var t_id = t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } #else // Release the resources of the Event Channel - this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_impl_->destroy (); // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_impl_->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ } ACE_CATCHANY @@ -500,7 +470,6 @@ TAO_CEC_Event_Loader::fini (void) // Do Nothing } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); ACE_TRY_EX (foo) { @@ -526,7 +495,6 @@ TAO_CEC_Event_Loader::fini (void) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index ba48e98cea8..b119e82f692 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -51,8 +51,7 @@ TAO_CEC_ProxyPullConsumer::activate ( CosEventChannelAdmin::ProxyPullConsumer_var result; ACE_TRY { - result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = this->_this (); } ACE_CATCHANY { @@ -63,19 +62,16 @@ TAO_CEC_ProxyPullConsumer::activate ( } void -TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -104,7 +100,6 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK_RETURN (0); if (this->is_connected_i () == 0) return 0; // ACE_THROW (CosEventComm::Disconnected ());???? @@ -123,7 +118,6 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( ACE_TRY { any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Inform the control that we got something from the supplier control->successful_transmission(this); @@ -131,14 +125,12 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -158,7 +150,6 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK_RETURN (0); if (this->is_connected_i () == 0) return 0; // ACE_THROW (CosEventComm::Disconnected ());???? @@ -173,8 +164,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + any = supplier->pull (); } ACE_CATCHANY { @@ -195,7 +185,6 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); disconnected = 0; if (this->is_connected_i () == 0) @@ -211,14 +200,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::shutdown (void) { CosEventComm::PullSupplier_var supplier; @@ -227,21 +216,18 @@ TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; supplier = this->supplier_._retn (); } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (supplier.in ())) return; ACE_TRY { - supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_pull_supplier (); } ACE_CATCHANY { @@ -296,7 +282,6 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -316,10 +301,8 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // What if a second thread connected us after this? @@ -372,7 +355,6 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception? @@ -384,14 +366,12 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( // Notify the event channel... this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_pull_supplier (); } ACE_CATCHANY { @@ -403,19 +383,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_add_ref (void) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_remove_ref (void) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 033e4e5476f..9ce0be748d9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -63,7 +63,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -76,7 +76,7 @@ public: /// Pulls from the supplier, verifies that it is connected. CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event ACE_ENV_ARG_DECL); - CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Any* pull_from_supplier (void); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -87,7 +87,7 @@ public: ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -99,13 +99,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); + virtual void _add_ref (void); + virtual void _remove_ref (void); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index ecadbc25ecf..cbbdc1c51d7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -50,8 +50,7 @@ TAO_CEC_ProxyPullSupplier::activate ( CosEventChannelAdmin::ProxyPullSupplier_var result; ACE_TRY { - result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = this->_this (); } ACE_CATCHANY { @@ -62,19 +61,16 @@ TAO_CEC_ProxyPullSupplier::activate ( } void -TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -87,7 +83,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::shutdown (void) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -98,21 +94,18 @@ TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; consumer = this->consumer_._retn (); } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (consumer.in ())) return; ACE_TRY { - consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer->disconnect_pull_consumer (); } ACE_CATCHANY { @@ -132,7 +125,6 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); disconnected = 0; if (this->is_connected_i () == 0) @@ -148,7 +140,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer->_non_existent (); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -170,7 +162,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event } CORBA::Any * -TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::pull (void) ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { @@ -257,7 +249,6 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -277,10 +268,8 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } return; } @@ -333,7 +322,6 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) ACE_THROW (CORBA::BAD_INV_ORDER ()); @@ -345,7 +333,6 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( // Notify the event channel.... this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (consumer.in ())) return; @@ -354,8 +341,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( { ACE_TRY { - consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer->disconnect_pull_consumer (); } ACE_CATCHANY { @@ -369,19 +355,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_add_ref (void) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_remove_ref (void) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index fa84ba336da..949afe498b7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -70,7 +70,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -85,7 +85,7 @@ public: CosEventComm::PullConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); + virtual void shutdown (void); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -105,12 +105,12 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Any * pull (void) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -118,9 +118,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); + virtual void _add_ref (void); + virtual void _remove_ref (void); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index c65d0968f98..b909b4b423c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -51,8 +51,7 @@ TAO_CEC_ProxyPushConsumer::activate ( CosEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { - result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = this->_this (); } ACE_CATCHANY { @@ -63,19 +62,16 @@ TAO_CEC_ProxyPushConsumer::activate ( } void -TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -97,7 +93,6 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); disconnected = false; if (!this->is_connected_i ()) @@ -113,14 +108,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (); #else return false; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::shutdown (void) { CosEventComm::PushSupplier_var supplier; @@ -129,22 +124,19 @@ TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; supplier = this->supplier_._retn (); this->connected_ = false; } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (supplier.in ())) return; ACE_TRY { - supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_push_supplier (); } ACE_CATCHANY { @@ -196,7 +188,6 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -216,10 +207,8 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // What if a second thread connected us after this? @@ -276,7 +265,6 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event this->event_channel_->consumer_admin ()->push (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -291,7 +279,6 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (!this->is_connected_i ()) ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception? @@ -303,7 +290,6 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( // Notify the event channel... this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (supplier.in ())) return; @@ -312,8 +298,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_push_supplier (); } ACE_CATCHANY { @@ -325,19 +310,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_add_ref (void) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_remove_ref (void) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 574670778c5..6057f466c8b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -65,7 +65,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return false if no supplier is connected... @@ -84,7 +84,7 @@ public: ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -99,13 +99,13 @@ public: virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); + virtual void _add_ref (void); + virtual void _remove_ref (void); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index b213428c4ed..139f413d2a0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -104,8 +104,7 @@ TAO_CEC_ProxyPushSupplier::activate ( CosEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { - result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = this->_this (); } ACE_CATCHANY { @@ -116,19 +115,16 @@ TAO_CEC_ProxyPushSupplier::activate ( } void -TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -141,7 +137,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::shutdown (void) { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) @@ -154,20 +150,18 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; typed_consumer = this->typed_consumer_._retn (); } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (typed_consumer.in ())) return; ACE_TRY_EX (typed) { - typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + typed_consumer->disconnect_push_consumer (); ACE_TRY_CHECK_EX (typed); } ACE_CATCHANY @@ -190,21 +184,18 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; consumer = this->consumer_._retn (); } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (consumer.in ())) return; ACE_TRY { - consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer->disconnect_push_consumer (); } ACE_CATCHANY { @@ -242,7 +233,6 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event this->event_channel_->dispatching ()->push (this, event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -273,7 +263,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event this->typed_event_channel_->dispatching ()->invoke (this, typed_event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -302,7 +291,6 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event this->event_channel_->dispatching ()->push_nocopy (this, event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -383,20 +371,17 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( CosTypedEventComm::TypedPushConsumer_var local_typed_consumer = CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Obtain the typed object interface from the consumer CORBA::Object_var local_typed_consumer_obj = CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer ( ACE_ENV_SINGLE_ARG_PARAMETER) ); - ACE_CHECK; { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -407,7 +392,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( this->cleanup_i (); this->typed_consumer_ = apply_policy (local_typed_consumer.in () ); - ACE_CHECK; TAO_CEC_Unlock reverse_lock (*this->lock_); @@ -416,27 +400,22 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->typed_event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } return; } this->typed_consumer_ = apply_policy (local_typed_consumer.in () ); - ACE_CHECK; // Store the typed object interface from the consumer this->typed_consumer_obj_ = apply_policy_obj (local_typed_consumer_obj.in () ); - ACE_CHECK; } // Notify the event channel... this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } /* this->is_typed_ec */ else @@ -456,7 +435,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -475,10 +453,8 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } return; } @@ -488,7 +464,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // Notify the event channel... this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) } /* ! this->is_typed_ec */ @@ -565,7 +540,6 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) ACE_THROW (CORBA::BAD_INV_ORDER ()); @@ -591,16 +565,13 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( if (this->is_typed_ec () ) { this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #else this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ // Disconnect callbacks @@ -611,7 +582,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY_EX (typed) { - typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + typed_consumer->disconnect_push_consumer (); ACE_TRY_CHECK_EX (typed); } ACE_CATCHANY @@ -632,8 +603,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY { - consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer->disconnect_push_consumer (); } ACE_CATCHANY { @@ -660,7 +630,6 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) return; // ACE_THROW (CosEventComm::Disconnected ());???? @@ -674,7 +643,6 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event ACE_TRY { consumer->push (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Inform the control that we were able to push something control->successful_transmission(this); @@ -682,14 +650,12 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) { control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -719,7 +685,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_TRY { consumer->push (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Inform the control that we were able to push something control->successful_transmission(this); @@ -731,7 +696,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer"); } control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { @@ -743,7 +707,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -767,7 +730,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) return; // ACE_THROW (CosEventComm::Disconnected ());???? @@ -791,11 +753,9 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e target_request.inout(), 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Call the DII invoke for the operation on the target object - target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + target_request->invoke (); // Inform the control that we were able to invoke something control->successful_transmission(this); @@ -807,7 +767,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer"); } control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { @@ -818,7 +777,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -872,11 +830,9 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer ( target_request.inout(), 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Call the DII invoke for the operation on the target object - target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + target_request->invoke (); // Inform the control that we were able to invoke something control->successful_transmission(this); @@ -888,7 +844,6 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer ( ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer"); } control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { @@ -899,7 +854,6 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer ( control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -923,7 +877,6 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); disconnected = 0; if (this->is_connected_i () == 0) @@ -956,26 +909,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer->_non_existent (); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_add_ref (void) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_remove_ref (void) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index d6fd0f41987..c712ca1aae3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -81,7 +81,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -96,7 +96,7 @@ public: CosEventComm::PushConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); + virtual void shutdown (void); /// Internal methods to push an event to each consumer. virtual void push (const CORBA::Any &event @@ -136,7 +136,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -144,9 +144,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); + virtual void _add_ref (void); + virtual void _remove_ref (void); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index d6c54e6d063..5e49263fc21 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -2,7 +2,7 @@ // Note: This class controls the behaviour of consumers connected to both // the Typed and Un-typed Event Channels. A check must be made in the code -// to ensure the correct EC is referenced. +// to ensure the correct EC is referenced. #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" @@ -104,7 +104,6 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers ( // Typed EC this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -113,12 +112,10 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers ( // Un-typed EC this->event_channel_->consumer_admin ()->for_each (&push_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_CEC_Ping_Pull_Consumer pull_worker (this); this->event_channel_->consumer_admin ()->for_each (&pull_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) } @@ -216,18 +213,16 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (query) { // Query the state of the consumers... - this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (); ACE_TRY_CHECK_EX (query); } ACE_CATCHANY @@ -239,11 +234,9 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } } ACE_CATCHANY @@ -263,12 +256,10 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout // value... @@ -285,7 +276,6 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Only schedule the timer, when the rate is not zero if (this->rate_ != ACE_Time_Value::zero) @@ -330,8 +320,7 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( { ACE_TRY { - proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_supplier (); if (TAO_debug_level >= 10) { @@ -355,8 +344,7 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( { ACE_TRY { - proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_pull_supplier (); } ACE_CATCHANY { @@ -377,8 +365,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception ( { if (this->need_to_disconnect (proxy)) { - proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_supplier (); if (TAO_debug_level >= 10) { @@ -423,24 +410,20 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { if (this->control_->need_to_disconnect (supplier)) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -462,24 +445,20 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { if (this->control_->need_to_disconnect (supplier)) { this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 16f6923d049..2f136c4f597 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -131,7 +131,7 @@ public: private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (ACE_ENV_SINGLE_ARG_DECL); + void query_consumers (void); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index fd58a376e20..955464c9fb7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -58,13 +58,11 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (query) { @@ -84,11 +82,9 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } } ACE_CATCHANY @@ -115,12 +111,10 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout // value... @@ -137,7 +131,6 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -185,7 +178,6 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer { any = consumer->try_pull_from_supplier (has_event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -197,7 +189,6 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer if (has_event) { this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index cd355c6c968..b56792be72b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -2,7 +2,7 @@ // Note: This class controls the behaviour of suppliers connected to both // the Typed and Un-typed Event Channels. A check must be made in the code -// to ensure the correct EC is referenced. +// to ensure the correct EC is referenced. #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" @@ -105,7 +105,6 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers ( this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -115,12 +114,10 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers ( TAO_CEC_Ping_Push_Supplier push_worker (this); this->event_channel_->supplier_admin ()->for_each (&push_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_CEC_Ping_Pull_Supplier pull_worker (this); this->event_channel_->supplier_admin ()->for_each (&pull_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) } @@ -217,18 +214,16 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (query) { // Query the state of the suppliers... - this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (); ACE_TRY_CHECK_EX (query); } ACE_CATCHANY @@ -240,11 +235,9 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } } ACE_CATCHANY @@ -264,12 +257,10 @@ TAO_CEC_Reactive_SupplierControl::activate (void) CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout // value... @@ -286,7 +277,6 @@ TAO_CEC_Reactive_SupplierControl::activate (void) Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Only schedule the timer, when the rate is not zero if (this->rate_ != ACE_Time_Value::zero) @@ -331,8 +321,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( { ACE_TRY { - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY { @@ -349,8 +338,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( { ACE_TRY { - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY { @@ -367,8 +355,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( { ACE_TRY { - proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_pull_consumer (); } ACE_CATCHANY { @@ -387,8 +374,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception ( { if (this->need_to_disconnect (proxy)) { - proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_pull_consumer (); } } ACE_CATCHANY @@ -427,24 +413,20 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { if (this->control_->need_to_disconnect (consumer)) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -467,24 +449,20 @@ TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { if (this->control_->need_to_disconnect (consumer)) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY @@ -507,24 +485,20 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (non_existent && !disconnected) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) { if (this->control_->need_to_disconnect (consumer)) { this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index da0433e2385..680925267fb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -133,7 +133,7 @@ public: private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); + void query_suppliers (void); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 6735b37cf40..a7b094610c1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -31,7 +31,7 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) } PortableServer::POA_ptr -TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_SupplierAdmin::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -79,27 +79,25 @@ TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer } void -TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::shutdown (void) { - this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->push_admin_.shutdown (); - this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->pull_admin_.shutdown (); } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_pull_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 7a9b06f4c3c..9880032ad37 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -51,7 +51,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin +class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin : public POA_CosEventChannelAdmin::SupplierAdmin { public: @@ -85,18 +85,18 @@ public: /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); private: /// The Event Channel we belong to @@ -105,11 +105,11 @@ private: /// The push and pull aspects are implemented using these classes TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel, TAO_CEC_ProxyPushConsumer, - CosEventChannelAdmin::ProxyPushConsumer> + CosEventChannelAdmin::ProxyPushConsumer> push_admin_; TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel, TAO_CEC_ProxyPullConsumer, - CosEventChannelAdmin::ProxyPullConsumer> + CosEventChannelAdmin::ProxyPullConsumer> pull_admin_; /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index eb44b1cbf9f..08b01c76972 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -36,7 +36,6 @@ TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event this->typed_push_admin_.for_each (&typed_event_worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -61,10 +60,9 @@ TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier } void -TAO_CEC_TypedConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedConsumerAdmin::shutdown (void) { - this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_push_admin_.shutdown (); } CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr @@ -93,32 +91,31 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( { // Register the consumer uses_interface with the EC int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (result == -1) { ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0); } - return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_push_admin_.obtain (); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } PortableServer::POA_ptr -TAO_CEC_TypedConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedConsumerAdmin::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 6fd7eeb02dd..f5fe7cc752d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -65,7 +65,7 @@ public: /// The typed event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr @@ -79,15 +79,15 @@ public: // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 66c4a913cdd..238ff2bb8b9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -76,7 +76,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) } void -TAO_CEC_TypedEventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedEventChannel::activate (void) { this->dispatching_->activate (); this->consumer_control_->activate (); @@ -101,49 +101,38 @@ namespace } void -TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::shutdown (void) { this->dispatching_->shutdown (); this->supplier_control_->shutdown (); this->consumer_control_->shutdown (); PortableServer::POA_var typed_consumer_poa = - this->typed_consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->_default_POA (); PortableServer::ObjectId_var typed_consumer_id = typed_consumer_poa->servant_to_id (this->typed_consumer_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; typed_consumer_poa->deactivate_object (typed_consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var typed_supplier_poa = - this->typed_supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->_default_POA (); PortableServer::ObjectId_var typed_supplier_id = typed_supplier_poa->servant_to_id (this->typed_supplier_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; typed_supplier_poa->deactivate_object (typed_supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->typed_supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->shutdown (); - this->typed_consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->shutdown (); if (destroy_on_shutdown_) { // Deactivate the Typed EC PortableServer::POA_var t_poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var t_id = t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_Event_Handler *timer; ACE_NEW (timer, ShutdownHandler (this->orb_.in ())); @@ -157,7 +146,6 @@ TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer ACE_ENV_ARG_DECL) { this->typed_supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -165,7 +153,6 @@ TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer ACE_ENV_ARG_DECL) { this->typed_supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -173,7 +160,6 @@ TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consume ACE_ENV_ARG_DECL) { this->typed_supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -181,7 +167,6 @@ TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->typed_consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -189,7 +174,6 @@ TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->typed_consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -197,7 +181,6 @@ TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier ACE_ENV_ARG_DECL) { this->typed_consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Find from the ifr cache the operation and return the parameter array pointer. @@ -279,12 +262,10 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ // Lookup the Interface Name in the IFR CORBA::Contained_var contained = this->interface_repository_->lookup_id (interface_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow the interface CORBA::InterfaceDef_var interface = CORBA::InterfaceDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (interface.in () )) { @@ -300,8 +281,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ { // Obtain the full interface description CORBA::InterfaceDef::FullInterfaceDescription_var fid = - interface->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + interface->describe_interface (); // Obtain the base interfaces this->base_interfaces_ = fid->base_interfaces; @@ -453,7 +433,6 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int { // Neither a consumer nor a supplier has connected yet int result = cache_interface_description (uses_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (result == 0) { @@ -517,7 +496,6 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su { // Neither a consumer nor a supplier has connected yet int result = cache_interface_description (supported_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (result == 0) { @@ -534,7 +512,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper ACE_ENV_ARG_DECL) { this->orb_->create_list (0, new_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; for (CORBA::ULong param=0; param<oper_params->num_params_; param++) { @@ -546,7 +523,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper any_1, oper_params->parameters_[param].direction_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -557,33 +533,31 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, ACE_ENV_ARG_DECL) { this->orb_->create_list (count, new_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr -TAO_CEC_TypedEventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->typed_consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr -TAO_CEC_TypedEventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->typed_supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_supplier_admin_->_this (); } void -TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!destroyed_) { destroyed_ = 1; - this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->shutdown (); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index dcec1e0713c..9765591afde 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -142,11 +142,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (void); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (void); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching (void) const; @@ -255,14 +255,14 @@ public: // = The CosTypedEventChannelAdmin::TypedEventChannel methods... virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index d352ff988c9..418a36b24a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -52,7 +52,6 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer this->oid_ = this->default_POA_->activate_object (this->dsi_impl_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { } @@ -65,7 +64,6 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void) ACE_TRY_NEW_ENV { this->default_POA_->deactivate_object (this->oid_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { } @@ -86,8 +84,7 @@ TAO_CEC_TypedProxyPushConsumer::activate ( CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result; ACE_TRY { - result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = this->_this (); } ACE_CATCHANY { @@ -98,19 +95,16 @@ TAO_CEC_TypedProxyPushConsumer::activate ( } void -TAO_CEC_TypedProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedProxyPushConsumer::deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -132,7 +126,6 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); disconnected = 0; if (this->is_connected_i () == 0) @@ -149,14 +142,14 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedProxyPushConsumer::shutdown (void) { CosEventComm::PushSupplier_var supplier; @@ -165,22 +158,19 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; supplier = this->typed_supplier_._retn (); this->connected_ = 0; } - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); if (CORBA::is_nil (supplier.in ())) return; ACE_TRY { - supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_push_supplier (); } ACE_CATCHANY { @@ -232,7 +222,6 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i ()) { @@ -252,10 +241,8 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier ( TAO_CEC_Unlock, ace_mon, reverse_lock, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // What if a second thread connected us after this? @@ -316,7 +303,6 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; if (this->is_connected_i () == 0) ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception? @@ -328,7 +314,6 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ( // Notify the event channel... this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!CORBA::is_nil (supplier.in ())) { @@ -336,8 +321,7 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier->disconnect_push_supplier (); } ACE_CATCHANY { @@ -350,25 +334,25 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_CEC_TypedProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedProxyPushConsumer::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_TypedProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedProxyPushConsumer::_add_ref (void) { this->_incr_refcnt (); } void -TAO_CEC_TypedProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedProxyPushConsumer::_remove_ref (void) { this->_decr_refcnt (); } CORBA::Object_ptr -TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 1e4e92bf612..a2c2365d2eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -56,7 +56,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) + virtual void deactivate (void) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -68,7 +68,7 @@ public: ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -89,7 +89,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)... @@ -99,9 +99,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); + virtual void _add_ref (void); + virtual void _remove_ref (void); protected: // The guard needs access to the following protected methods. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index fe047155c0f..a282e7d3995 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -25,7 +25,7 @@ TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void) } PortableServer::POA_ptr -TAO_CEC_TypedSupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedSupplierAdmin::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -52,10 +52,9 @@ TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consum } void -TAO_CEC_TypedSupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedSupplierAdmin::shutdown (void) { - this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_push_admin_.shutdown (); } CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr @@ -70,14 +69,13 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer ( { int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (result == -1) { ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (),0); } - return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr @@ -95,14 +93,14 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index d7c29fb9f81..4d6bfa36941 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -57,7 +57,7 @@ public: /// The typed event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (void); // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods... virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr @@ -74,15 +74,15 @@ public: // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (void); private: /// The Event Channel we belong to |