diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp | 54 |
1 files changed, 21 insertions, 33 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 3e095e32f73..c8555faceea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -218,7 +218,7 @@ TAO_CosNotify_Service::fini (void) } void -TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) +TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb) { ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n")); @@ -233,42 +233,38 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) char *argv0 = 0; char **argv = &argv0; // ansi requires argv be null terminated. CORBA::ORB_var dispatcher = CORBA::ORB_init (argc, argv, - "default_dispatcher" ACE_ENV_ARG_PARAMETER); - //ACE_CHECK_RETURN (-1); + "default_dispatcher"); TAO_Notify_PROPERTIES::instance()->dispatching_orb(dispatcher.in()); } - this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb() ACE_ENV_ARG_PARAMETER); + this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb()); } else { - this->init_i (orb ACE_ENV_ARG_PARAMETER); + this->init_i (orb); } } void -TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL) +TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb) { - this->init_i2 (orb, dispatching_orb ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->init_i2 (orb, dispatching_orb); } void -TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) +TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb) { // Obtain the Root POA CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); - PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); // Set the properties TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance(); @@ -277,30 +273,26 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) properties->default_poa (default_poa.in ()); // Init the factory - this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + this->factory_.reset (this->create_factory ()); ACE_ASSERT( this->factory_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get()); - this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + this->builder_.reset (this->create_builder ()); ACE_ASSERT( this->builder_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get()); } void -TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL) +TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb) { // Obtain the Root POA CORBA::Object_var object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); - PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); // Set the properties TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance(); @@ -312,19 +304,17 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o properties->default_poa (default_poa.in ()); // Init the factory and builder - this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + this->factory_.reset (this->create_factory ()); ACE_ASSERT( this->factory_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get()); - this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + this->builder_.reset (this->create_builder ()); ACE_ASSERT( this->builder_.get() != 0 ); TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get()); } TAO_Notify_Factory* -TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_CosNotify_Service::create_factory (void) { TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory"); if (factory == 0) @@ -332,31 +322,29 @@ TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (factory, TAO_Notify_Default_Factory (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); } return factory; } TAO_Notify_Builder* -TAO_CosNotify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL) +TAO_CosNotify_Service::create_builder (void) { TAO_Notify_Builder* builder = 0; ACE_NEW_THROW_EX (builder, TAO_Notify_Builder (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return builder; } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) +TAO_CosNotify_Service::create (PortableServer::POA_ptr poa) { - return this->builder().build_event_channel_factory (poa ACE_ENV_ARG_PARAMETER); + return this->builder().build_event_channel_factory (poa); } void -TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED) +TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/) { // NOP. } |