diff options
Diffstat (limited to 'TAO/orbsvcs/examples')
65 files changed, 1138 insertions, 1121 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 5399f5e0ca0..4a51dcb8c13 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -24,8 +24,8 @@ TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void) int TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, const char* child_poa_name, - CosNaming::NamingContext_ptr naming, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::NamingContext_ptr naming + TAO_ENV_ARG_DECL) { // Check if we have a parent poa. if (CORBA::is_nil (poa)) @@ -37,13 +37,13 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, // Create a UNIQUE_ID and USER_ID policy because we want the POA // to detect duplicates for us. PortableServer::IdUniquenessPolicy_var idpolicy = - poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID, - ACE_TRY_ENV); + poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::IdAssignmentPolicy_var assignpolicy = - poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create a PolicyList @@ -55,22 +55,22 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ()); PortableServer::POAManager_ptr manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here. // Create the child POA. this->poa_ = poa->create_POA (child_poa_name, manager, - policy_list, - ACE_TRY_ENV); + policy_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - idpolicy->destroy (ACE_TRY_ENV); + idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - assignpolicy->destroy (ACE_TRY_ENV); + assignpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //this->poa_ = PortableServer::POA::_duplicate (poa); @@ -80,8 +80,8 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::create (const char * channel_id, - CORBA::Boolean store_in_naming_service, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean store_in_naming_service + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelFactory::DuplicateChannel, @@ -99,7 +99,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, // let all those contained in FactoryEC use the default POA. // We only need the FactoryEC's to be unique! - PortableServer::POA_ptr defPOA = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_ptr defPOA = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA); @@ -112,18 +112,18 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, auto_ptr <TAO_CEC_EventChannel> ec (impl); - impl->activate (ACE_TRY_ENV); + impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_->activate_object_with_id (oid.in (), - ec.get (), - ACE_TRY_ENV); + ec.get () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ec.release (); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in (), ACE_TRY_ENV); + this->poa_->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (store_in_naming_service && @@ -134,8 +134,8 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, name[0].id = CORBA::string_dup (channel_id); this->naming_->rebind (name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -191,8 +191,8 @@ void TAO_CosEventChannelFactory_i::destroy ( const char * channel_id, - CORBA::Boolean unbind_from_naming_service, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean unbind_from_naming_service + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -208,16 +208,16 @@ TAO_CosEventChannelFactory_i::destroy PortableServer::string_to_ObjectId (channel_id); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var fact_ec = - CosEventChannelAdmin::EventChannel::_narrow (obj.in (), - ACE_TRY_ENV); + CosEventChannelAdmin::EventChannel::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fact_ec->destroy (ACE_TRY_ENV); + fact_ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Remove from the naming service. @@ -228,8 +228,8 @@ TAO_CosEventChannelFactory_i::destroy name.length (1); name[0].id = CORBA::string_dup (channel_id); - this->naming_->unbind (name, - ACE_TRY_ENV); + this->naming_->unbind (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -256,8 +256,8 @@ TAO_CosEventChannelFactory_i::destroy CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::find ( - const char * channel_id, - CORBA::Environment &ACE_TRY_ENV + const char * channel_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -274,8 +274,8 @@ TAO_CosEventChannelFactory_i::find PortableServer::string_to_ObjectId (channel_id); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -294,8 +294,8 @@ TAO_CosEventChannelFactory_i::find char* TAO_CosEventChannelFactory_i::find_channel_id ( - CosEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV + CosEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -308,8 +308,8 @@ TAO_CosEventChannelFactory_i::find_channel_id ACE_TRY { PortableServer::ObjectId_var oid = - this->poa_->reference_to_id (channel, - ACE_TRY_ENV); + this->poa_->reference_to_id (channel + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; str_return = PortableServer::ObjectId_to_string (oid.in ()); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index ade9cd1cc75..c15937667e5 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -50,8 +50,8 @@ class TAO_CosEventChannelFactory_i : int init (PortableServer::POA_ptr poa, const char* child_poa_name, - CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil (), - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil () + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // This method creates a child poa with <poa> as the // parent. It also accepts a Naming_Context which is used to register // the event channels if specified. @@ -66,7 +66,7 @@ class TAO_CosEventChannelFactory_i : // doesn't have to be exposed through the IDL interface. Anyway, // there must be a way to cleanup any resources created by the // factory, and you must avoid CORBA calls in the destructor, - // first because you won't have an ACE_TRY_ENV and second because + // first because you won't have an TAO_ENV_SINGLE_ARG_PARAMETER and second because // exceptions in destructors are evil. // @@ Pradeep: anyway you can just use exceptions and not return -1? @@ -74,8 +74,8 @@ class TAO_CosEventChannelFactory_i : virtual CosEventChannelAdmin::EventChannel_ptr create ( const char * channel_id, - CORBA::Boolean store_in_naming_service, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean store_in_naming_service + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -86,8 +86,8 @@ class TAO_CosEventChannelFactory_i : virtual void destroy ( const char * channel_id, - CORBA::Boolean unbind_from_naming_service, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean unbind_from_naming_service + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -96,8 +96,8 @@ class TAO_CosEventChannelFactory_i : virtual CosEventChannelAdmin::EventChannel_ptr find ( - const char * channel_id, - CORBA::Environment &ACE_TRY_ENV + const char * channel_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -106,8 +106,8 @@ class TAO_CosEventChannelFactory_i : virtual char * find_channel_id ( - CosEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV + CosEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index f281e089dbf..78916b722b6 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -20,39 +20,39 @@ public: virtual ~FactoryClient (void); // destructor. - void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_factory (CORBA::Environment &ACE_TRY_ENV); + void resolve_factory (TAO_ENV_SINGLE_ARG_DECL); // Try to resolve the factory from the Naming service. CosEventChannelFactory::ChannelFactory_ptr - create_factory (CORBA::Environment &ACE_TRY_ENV); + create_factory (TAO_ENV_SINGLE_ARG_DECL); // Create a local Factory and also set the <factory_>. - virtual void run_test (CORBA::Environment &ACE_TRY_ENV); + virtual void run_test (TAO_ENV_SINGLE_ARG_DECL); // Runs a couple of tests to check if the factory behaves correctly. protected: CosEventChannelAdmin::EventChannel_ptr create_channel (const char *channel_id, - CosEventChannelFactory::ChannelFactory_ptr factory, - CORBA::Environment &ACE_TRY_ENV); + CosEventChannelFactory::ChannelFactory_ptr factory + TAO_ENV_ARG_DECL); // Create a channel. - void destroy_channel (const char *channel_id, - CORBA::Environment &ACE_TRY_ENV); + void destroy_channel (const char *channel_id + TAO_ENV_ARG_DECL); // Destroy the channel. - void find_channel (const char* channel_id, - CORBA::Environment &ACE_TRY_ENV); + void find_channel (const char* channel_id + TAO_ENV_ARG_DECL); // Find a channel. - void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV); + void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL); // Find a channel. // = Protected Data members. @@ -86,22 +86,22 @@ FactoryClient::~FactoryClient (void) void FactoryClient::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FactoryClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -109,14 +109,14 @@ FactoryClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->use_naming_service = 1; } void -FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV) +FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (this->use_naming_service == 1); @@ -125,18 +125,18 @@ FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV) name[0].id = CORBA::string_dup (this->factory_name_); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->factory_ = - CosEventChannelFactory::ChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosEventChannelFactory::ChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelFactory::ChannelFactory_ptr -FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV) +FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::UNKNOWN (), CosEventChannelFactory::ChannelFactory::_nil ()); @@ -144,8 +144,8 @@ FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV) CosEventChannelAdmin::EventChannel_ptr FactoryClient::create_channel (const char *channel_id, - CosEventChannelFactory::ChannelFactory_ptr factory, - CORBA::Environment &ACE_TRY_ENV) + CosEventChannelFactory::ChannelFactory_ptr factory + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Trying to create channel %s\n", channel_id)); @@ -156,8 +156,8 @@ FactoryClient::create_channel (const char *channel_id, ACE_TRY { ec = factory->create (channel_id, - this->use_naming_service, - ACE_TRY_ENV); + this->use_naming_service + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (!CORBA::is_nil (ec.in ())); @@ -184,22 +184,22 @@ FactoryClient::create_channel (const char *channel_id, } void -FactoryClient::destroy_channel (const char *channel_id, - CORBA::Environment &ACE_TRY_ENV) +FactoryClient::destroy_channel (const char *channel_id + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Destroying Cos Event Channel \"%s \"\n", channel_id)); this->factory_->destroy (channel_id, - use_naming_service, - ACE_TRY_ENV); + use_naming_service + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FactoryClient::find_channel (const char* channel_id, - CORBA::Environment &ACE_TRY_ENV) +FactoryClient::find_channel (const char* channel_id + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -208,22 +208,22 @@ FactoryClient::find_channel (const char* channel_id, channel_id)); CosEventChannelAdmin::EventChannel_var channel = - this->factory_->find (channel_id, - ACE_TRY_ENV); + this->factory_->find (channel_id + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb_->object_to_string (channel.in (), - ACE_TRY_ENV); + orb_->object_to_string (channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Find returned - %s \n", str.in ())); - this->find_channel_id (channel.in (), - ACE_TRY_ENV); + this->find_channel_id (channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) @@ -240,12 +240,12 @@ FactoryClient::find_channel (const char* channel_id, } void -FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) +FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { CORBA::String_var str = - orb_->object_to_string (channel, - ACE_TRY_ENV); + orb_->object_to_string (channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -253,8 +253,8 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel, str.in ())); char *channel_id = - this->factory_->find_channel_id (channel, - ACE_TRY_ENV); + this->factory_->find_channel_id (channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -266,7 +266,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel, */ void -FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV) +FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->factory_.in ())); @@ -275,86 +275,86 @@ FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV) // create the first cosec cosec[0] = this->create_channel (channel_id[0], - this->factory_.in (), - ACE_TRY_ENV); + this->factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // create the second cosec cosec[1] = this->create_channel (channel_id[1], - this->factory_.in (), - ACE_TRY_ENV); + this->factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // create the third cosec cosec[2] = this->create_channel (channel_id[2], - this->factory_.in (), - ACE_TRY_ENV); + this->factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // see it we can destroy this one.. - this->destroy_channel (channel_id[2], - ACE_TRY_ENV); + this->destroy_channel (channel_id[2] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // see if we can find it? - this->find_channel_id (cosec[2].in (), - ACE_TRY_ENV); + this->find_channel_id (cosec[2].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // see if we can create it again? cosec[2] = this->create_channel (channel_id[2], - this->factory_.in (), - ACE_TRY_ENV); + this->factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // try and find a channel that does not exist. - this->find_channel ("areyouthere?", - ACE_TRY_ENV); + this->find_channel ("areyouthere?" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // see if it can detect duplicates. this->create_channel (channel_id[2], - this->factory_.in (), - ACE_TRY_ENV); + this->factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // see if it can give us the id? - this->find_channel_id (cosec[0].in (), - ACE_TRY_ENV); + this->find_channel_id (cosec[0].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->find_channel_id (cosec[1].in (), - ACE_TRY_ENV); + this->find_channel_id (cosec[1].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->find_channel_id (cosec[2].in (), - ACE_TRY_ENV); + this->find_channel_id (cosec[2].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // check if we can get the channels from the id. - this->find_channel (channel_id[0], - ACE_TRY_ENV); + this->find_channel (channel_id[0] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->find_channel (channel_id[1], - ACE_TRY_ENV); + this->find_channel (channel_id[1] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->find_channel (channel_id[2], - ACE_TRY_ENV); + this->find_channel (channel_id[2] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; //destroy them all. - this->destroy_channel (channel_id[0], - ACE_TRY_ENV); + this->destroy_channel (channel_id[0] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_channel (channel_id[1], - ACE_TRY_ENV); + this->destroy_channel (channel_id[1] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_channel (channel_id[2], - ACE_TRY_ENV); + this->destroy_channel (channel_id[2] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // end of testing. @@ -372,16 +372,16 @@ main (int argc, char *argv []) FactoryClient ft; ft.init_ORB (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (naming) { - ft.resolve_naming_service (ACE_TRY_ENV); + ft.resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (naming); - ft.resolve_factory (ACE_TRY_ENV); + ft.resolve_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (naming); } ACE_CATCHANY @@ -391,12 +391,12 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Creating a local Factory\n")); // TBD: - ft.create_factory (ACE_TRY_ENV); + ft.create_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; - ft.run_test (ACE_TRY_ENV); + ft.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index d42c978af56..f769ac17c68 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -52,13 +52,13 @@ FactoryDriver::parse_args (int argc, char *argv []) int FactoryDriver::start (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv) == -1) @@ -70,8 +70,8 @@ FactoryDriver::start (int argc, char *argv []) -1); CORBA::Object_var poa_object = - orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -80,16 +80,16 @@ FactoryDriver::start (int argc, char *argv []) -1); root_poa_ = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -105,24 +105,24 @@ FactoryDriver::start (int argc, char *argv []) if (factory_servant_->init (root_poa_.in (), child_poa_name_, - context.in (), - ACE_TRY_ENV) != 0) + context.in () + TAO_ENV_ARG_PARAMETER) != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to initialize " "the factory. \n"), 1); // activate the factory in the root poa. - factory_ = factory_servant_->_this (ACE_TRY_ENV); + factory_ = factory_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Give the ownership to the POA. - factory_servant_->_remove_ref (ACE_TRY_ENV); + factory_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var - str = orb_->object_to_string (factory_.in (), - ACE_TRY_ENV); + str = orb_->object_to_string (factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -133,8 +133,8 @@ FactoryDriver::start (int argc, char *argv []) name.length (1); name[0].id = CORBA::string_dup (factoryName_); naming_client_->rebind (name, - factory_.in (), - ACE_TRY_ENV); + factory_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index bbab4d8b2a4..65d41b4784b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -18,30 +18,30 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void) } void -RtEC_Based_CosEC::init_ORB (int& argc, char *argv [], - CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_ = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_TRY_ENV); + this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -99,44 +99,44 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv []) } void -RtEC_Based_CosEC::startup (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::startup (int argc, char *argv[] + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Starting up the CosEvent Service...\n")); // initalize the ORB. - this->init_ORB (argc, argv, - ACE_TRY_ENV); + this->init_ORB (argc, argv + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->parse_args (argc, argv) == -1) ACE_THROW (CORBA::BAD_PARAM ()); - this->resolve_naming_service (ACE_TRY_ENV); + this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->init (this->poa_.in (), this->poa_.in (), this->eventTypeIds_, this->eventSourceIds_, - this->source_type_pairs_, - ACE_TRY_ENV); + this->source_type_pairs_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->activate (ACE_TRY_ENV); + this->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register ourselves with the naming service. ACE_ASSERT(!CORBA::is_nil (this->naming_.in ())); CORBA::Object_var obj = - this->poa_->servant_to_reference (this, - ACE_TRY_ENV); + this->poa_->servant_to_reference (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (obj.in (), ACE_TRY_ENV); + this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -147,8 +147,8 @@ RtEC_Based_CosEC::startup (int argc, char *argv[], name[0].id = CORBA::string_dup (this->service_name); this->naming_->rebind (name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -157,28 +157,28 @@ RtEC_Based_CosEC::startup (int argc, char *argv[], } POA_RtecEventChannelAdmin::EventChannel_ptr -RtEC_Based_CosEC::create_rtec (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::create_rtec (TAO_ENV_SINGLE_ARG_DECL) { // see if the user wants a local RtEC.. if (this->remote_rtec_ == 0) - return CosEC_ServantBase::create_rtec (ACE_TRY_ENV); + return CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); else return 0; } void -RtEC_Based_CosEC::activate_rtec (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) { // see if the user wants to use a local RtEC.. if (this->remote_rtec_ == 0) { - CosEC_ServantBase::activate_rtec (ACE_TRY_ENV); + CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else { // Try to locate a remote rtec. - this->locate_rtec (ACE_TRY_ENV); + this->locate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Use the return value to check success. @@ -189,18 +189,18 @@ RtEC_Based_CosEC::activate_rtec (CORBA::Environment &ACE_TRY_ENV) } void -RtEC_Based_CosEC::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL) { // Check if the local rtec is to be deactivated. if (this->remote_rtec_ == 0) { - CosEC_ServantBase::deactivate_rtec (ACE_TRY_ENV); + CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -RtEC_Based_CosEC::locate_rtec (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name ref_name (1); ref_name.length (1); @@ -208,22 +208,22 @@ RtEC_Based_CosEC::locate_rtec (CORBA::Environment &ACE_TRY_ENV) CORBA::string_dup (this->rt_service_name); CORBA::Object_var obj = - this->naming_->resolve (ref_name, - ACE_TRY_ENV); + this->naming_->resolve (ref_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->rtec_ = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RtEC_Based_CosEC::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -231,8 +231,8 @@ RtEC_Based_CosEC::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -243,7 +243,7 @@ RtEC_Based_CosEC::run (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -256,10 +256,10 @@ RtEC_Based_CosEC::run (void) } void -RtEC_Based_CosEC::shutdown (CORBA::Environment &ACE_TRY_ENV) +RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate. - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Unbind from the naming service. @@ -267,8 +267,8 @@ RtEC_Based_CosEC::shutdown (CORBA::Environment &ACE_TRY_ENV) name.length (1); name[0].id = CORBA::string_dup (this->service_name); - this->naming_->unbind (name, - ACE_TRY_ENV); + this->naming_->unbind (name + TAO_ENV_ARG_PARAMETER); // shutdown the ORB. if (!CORBA::is_nil (this->orb_.in ())) @@ -285,8 +285,8 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { service.startup (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (service.run () == -1) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index f3dfb3921c7..e11b80438af 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -43,8 +43,8 @@ class RtEC_Based_CosEC : public CosEC_ServantBase int parse_args (int argc, char *argv []); // Parses the command line arguments. - void startup (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV); + void startup (int argc, char *argv[] + TAO_ENV_ARG_DECL); // Initializes the COS Event Service. // Returns 0 on success, -1 on error. @@ -52,31 +52,30 @@ class RtEC_Based_CosEC : public CosEC_ServantBase // run the COS Event Service. // Returns 0 on success, -1 on error. - void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Shutdown the COS Event Service. // Returns 0 on success, -1 on error. protected: // = Methods from CosEC_ServantBase virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (CORBA::Environment &ACE_TRY_ENV); + create_rtec (TAO_ENV_SINGLE_ARG_DECL); // Create a local rtec. - virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV); + virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL); // Activates the rtec. - virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV); + virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. - void init_ORB (int& argc, char *argv [], - CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int& argc, char *argv [] + TAO_ENV_ARG_DECL); // initialize the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Resolve the naming service. - void locate_rtec (CORBA::Environment &ACE_TRY_ENV); + void locate_rtec (TAO_ENV_SINGLE_ARG_DECL); // Locate a rtec. // = Data members diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 362875858cc..87e69d4fa69 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier = - this->rtec_consumeradmin_->obtain_push_supplier (ACE_TRY_ENV); + this->rtec_consumeradmin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier; @@ -47,11 +47,11 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV auto_proxysupplier (proxypushsupplier); CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj = - auto_proxysupplier.get ()->_this (ACE_TRY_ENV); + auto_proxysupplier.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); // give the ownership to the POA. - auto_proxysupplier.get ()->_remove_ref (ACE_TRY_ENV); + auto_proxysupplier.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); auto_proxysupplier.release (); @@ -59,7 +59,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &) +TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index cba88a57bcb..d27a0bc2575 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -55,12 +55,12 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV) + obtain_push_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV) + obtain_pull_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullSupplier_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index e8663c996d8..5f9be775b2d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -33,8 +33,8 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, PortableServer::POA_ptr poa, char *, char *, - char *, - CORBA::Environment &ACE_TRY_ENV) + char * + TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (thispoa)); ACE_ASSERT (!CORBA::is_nil (poa)); @@ -44,11 +44,11 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, this->poa_ = PortableServer::POA::_duplicate (poa); auto_ptr<POA_RtecEventChannelAdmin::EventChannel> - auto_rtec_servant_ (this->create_rtec (ACE_TRY_ENV)); + auto_rtec_servant_ (this->create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; auto_ptr<TAO_CosEC_EventChannel_i> - auto_cosec_servant_ (this->create_cosec (ACE_TRY_ENV)); + auto_cosec_servant_ (this->create_cosec (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; // if all the servants were allocated then set the class pointers. @@ -57,17 +57,17 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, } int -CosEC_ServantBase::activate (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); // Activate the Rtec - this->activate_rtec (ACE_TRY_ENV); + this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the CosEC - int retval = this->activate_cosec (ACE_TRY_ENV); + int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval != 0) return -1; @@ -76,34 +76,34 @@ CosEC_ServantBase::activate (CORBA::Environment &ACE_TRY_ENV) // Note that the POA is <thispoa_> PortableServer::ObjectId_var oid = - this->thispoa_->activate_object (this, - ACE_TRY_ENV); + this->thispoa_->activate_object (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->_remove_ref (ACE_TRY_ENV); + this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = - this->thispoa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->thispoa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; // success. } int -CosEC_ServantBase::activate (const char* servant_id, - CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::activate (const char* servant_id + TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); // Activate the Rtec - this->activate_rtec (ACE_TRY_ENV); + this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the CosEC - int retval = this->activate_cosec (ACE_TRY_ENV); + int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval != 0) return -1; @@ -114,36 +114,36 @@ CosEC_ServantBase::activate (const char* servant_id, // Activate ourselves. // Note that the POA is <thispoa_> this->thispoa_->activate_object_with_id (oid.in (), - this, - ACE_TRY_ENV); + this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->_remove_ref (ACE_TRY_ENV); + this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = - this->thispoa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->thispoa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; // success. } void -CosEC_ServantBase::activate_rtec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) { // Activate the Rtec PortableServer::ObjectId_var oid = - this->poa_->activate_object (this->rtec_servant_, - ACE_TRY_ENV); + this->poa_->activate_object (this->rtec_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->rtec_servant_->_remove_ref (ACE_TRY_ENV); + this->rtec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->rtec_ = @@ -151,7 +151,7 @@ CosEC_ServantBase::activate_rtec (CORBA::Environment &ACE_TRY_ENV) } int -CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL) { // Initialize the CosEC servant. RtecBase::handle_t supp_handle = 0; @@ -175,23 +175,23 @@ CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV) if (this->cosec_servant_->init (consumerqos, supplierqos, - this->rtec_.in (), - ACE_TRY_ENV) != 0) + this->rtec_.in () + TAO_ENV_ARG_PARAMETER) != 0) return -1; ACE_CHECK_RETURN (-1); // Activate the CosEC PortableServer::ObjectId_var oid = - this->poa_->activate_object (this->cosec_servant_, - ACE_TRY_ENV); + this->poa_->activate_object (this->cosec_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->cosec_servant_->_remove_ref (ACE_TRY_ENV); + this->cosec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->cosec_ = @@ -200,84 +200,84 @@ CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV) } void -CosEC_ServantBase::deactivate (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::deactivate (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate all those we control... - this->deactivate_rtec (ACE_TRY_ENV); + this->deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate_cosec (ACE_TRY_ENV); + this->deactivate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Finally we go away.. PortableServer::ObjectId_var oid = - this->thispoa_->servant_to_id (this, - ACE_TRY_ENV); + this->thispoa_->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. - this->thispoa_->deactivate_object (oid.in (), - ACE_TRY_ENV); + this->thispoa_->deactivate_object (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CosEC_ServantBase::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate the rtec. PortableServer::ObjectId_var oid = - this->poa_->servant_to_id (this->rtec_servant_, - ACE_TRY_ENV); + this->poa_->servant_to_id (this->rtec_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. - this->poa_->deactivate_object (oid.in (), - ACE_TRY_ENV); + this->poa_->deactivate_object (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CosEC_ServantBase::deactivate_cosec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate the cosec. PortableServer::ObjectId_var oid = - this->poa_->servant_to_id (this->cosec_servant_, - ACE_TRY_ENV); + this->poa_->servant_to_id (this->cosec_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. - this->poa_->deactivate_object (oid.in (), - ACE_TRY_ENV); + this->poa_->deactivate_object (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ConsumerAdmin_ptr -CosEC_ServantBase::for_consumers (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->cosec_->for_consumers (ACE_TRY_ENV); + return this->cosec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -CosEC_ServantBase::for_suppliers (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->cosec_->for_suppliers (ACE_TRY_ENV); + return this->cosec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); } void -CosEC_ServantBase::destroy (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } POA_RtecEventChannelAdmin::EventChannel_ptr -CosEC_ServantBase::create_rtec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL) { // Create the RtEC servant. TAO_EC_Event_Channel_Attributes attr (this->poa_.in (), @@ -292,7 +292,7 @@ CosEC_ServantBase::create_rtec (CORBA::Environment &ACE_TRY_ENV) } TAO_CosEC_EventChannel_i* -CosEC_ServantBase::create_cosec (CORBA::Environment &ACE_TRY_ENV) +CosEC_ServantBase::create_cosec (TAO_ENV_SINGLE_ARG_DECL) { // Create the CosEC servant. TAO_CosEC_EventChannel_i* _cosec_servant; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index f77b0f725f8..129acbaee48 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -58,55 +58,55 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : PortableServer::POA_ptr poa, char *eventTypeIds, char *eventSourceIds, - char *source_type_pairs, - CORBA::Environment &ACE_TRY_ENV); + char *source_type_pairs + TAO_ENV_ARG_DECL); // This method creates a local scheduler, rtec and cosec. // The POA <poa> specified here is used when <activate> is called to // activate the contained servants. // The POA <thispoa> is used to activate this. - int activate (CORBA::Environment &ACE_TRY_ENV); + int activate (TAO_ENV_SINGLE_ARG_DECL); // Activates the CosEC with <thispoa_> and friends with the <poa_> - int activate (const char* servant_id, CORBA::Environment &ACE_TRY_ENV); + int activate (const char* servant_id TAO_ENV_ARG_DECL); // If the servant_id is not nil then it is used to supply the object id // for <this> servant. - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Deactivates the CosEC and friends with the POA. // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV) + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV) + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys this Event Channel object. protected: // = RtEC creation, activation and deactivation methods. virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (CORBA::Environment &ACE_TRY_ENV); + create_rtec (TAO_ENV_SINGLE_ARG_DECL); // Create a local rtec. - virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV); + virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL); // Activates the rtec. - virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV); + virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. // = CosEC creation, activation and deactivation methods. TAO_CosEC_EventChannel_i* - create_cosec (CORBA::Environment &ACE_TRY_ENV); + create_cosec (TAO_ENV_SINGLE_ARG_DECL); // Create a local cosec. - int activate_cosec (CORBA::Environment &ACE_TRY_ENV); + int activate_cosec (TAO_ENV_SINGLE_ARG_DECL); // Activates the cosec. - void deactivate_cosec (CORBA::Environment &ACE_TRY_ENV); + void deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL); // Deactivates the cosec. void init_SupplierQOS (RtecBase::handle_t supp_handle, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index b6f5ca51e2c..5f5cac0743d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -19,8 +19,8 @@ TAO_CosEC_EventChannel_i::~TAO_CosEC_EventChannel_i (void) int TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos, const RtecEventChannelAdmin::SupplierQOS &supplierqos, - RtecEventChannelAdmin::EventChannel_ptr rtec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr rtec + TAO_ENV_ARG_DECL) { // Allocate the admins.. TAO_CosEC_ConsumerAdmin_i *consumer_; @@ -38,7 +38,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_); RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin = - rtec->for_consumers (ACE_TRY_ENV); + rtec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (auto_consumer_.get ()->init (consumerqos, @@ -46,15 +46,15 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum return -1; this->consumeradmin_ = - auto_consumer_.get ()->_this (ACE_TRY_ENV); + auto_consumer_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // give the ownership to the POA. - auto_consumer_.get ()->_remove_ref (ACE_TRY_ENV); + auto_consumer_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin = - rtec->for_suppliers (ACE_TRY_ENV); + rtec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (auto_supplier_.get ()->init (supplierqos, @@ -62,11 +62,11 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum return -1; this->supplieradmin_ = - auto_supplier_.get ()->_this (ACE_TRY_ENV); + auto_supplier_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // give the ownership to the POA. - auto_supplier_.get ()->_remove_ref (ACE_TRY_ENV); + auto_supplier_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->consumer_admin_ = auto_consumer_.release (); @@ -76,7 +76,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &) +TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is @@ -86,7 +86,7 @@ TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &) } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &) +TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is @@ -96,20 +96,20 @@ TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &) } void -TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the CosEventChannel PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplieradmin_ = CosEventChannelAdmin::SupplierAdmin::_nil (); @@ -117,9 +117,9 @@ TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_EventChannel_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->destroy (ACE_TRY_ENV); + this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index a3fad3fa03b..fb7015ab3bf 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -58,26 +58,26 @@ public: int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos, const RtecEventChannelAdmin::SupplierQOS &supplierqos, - RtecEventChannelAdmin::EventChannel_ptr rtec, - CORBA::Environment &ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel_ptr rtec + TAO_ENV_ARG_DECL); // Activates the ConsumerAdmin and SupplierAdmin servants. Returns // -1 on error, 0 on success. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV) + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The for_consumers method will return the same ConsumerAdmin_ptr // everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV) + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The for_suppliers method will return the same SupplierAdmin_ptr // everytime its called. - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys this Event Channel object. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // destroys this Event Channel object and <delete>s this object. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 9e4a3ea8239..c0f97807d8c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -32,7 +32,7 @@ public: ~TAO_CosEC_PushSupplierWrapper (void); // Destructor. - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the push supplier. @@ -64,24 +64,24 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void) } void -TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->supplier_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the supplier proxy PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -103,8 +103,8 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void) } void -TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::Event buffer[1]; @@ -137,36 +137,36 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data, e.data.any_value = data; - this->proxypushconsumer_->push (events, - ACE_TRY_ENV); + this->proxypushconsumer_->push (events + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->proxypushconsumer_->disconnect_push_consumer (ACE_TRY_ENV); + this->proxypushconsumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the ProxyPushConsumer PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -184,17 +184,17 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier auto_wrapper (wrapper); RtecEventComm::PushSupplier_ptr rtecpushsupplier - = auto_wrapper.get ()->_this (ACE_TRY_ENV); + = auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // give the ownership to the POA. - auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV); + auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxypushconsumer_->connect_push_supplier (rtecpushsupplier, - this->qos_, - ACE_TRY_ENV); + this->qos_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->wrapper_ = auto_wrapper.release (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index 6260267fce2..d999ed7ae5f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -61,17 +61,17 @@ public: ~TAO_CosEC_ProxyPushConsumer_i (void); // Destructor. - virtual void push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV) + virtual void push (const CORBA::Any &data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the supplier from the event communication. - virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV) + virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 276baf913d2..f1597deac7c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -31,12 +31,12 @@ public: ~TAO_CosEC_PushConsumerWrapper (void); // Destructor. - virtual void push (const RtecEventComm::EventSet & data, - CORBA::Environment &ACE_TRY_ENV) + virtual void push (const RtecEventComm::EventSet & data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is called by the RTEvent Channel to supply data. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the consumer from the event channel. @@ -62,8 +62,8 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper () } void -TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set, - CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; @@ -72,8 +72,8 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set, { ACE_TRY { - this->consumer_->push (set[i].data.any_value, - ACE_TRY_ENV); + this->consumer_->push (set[i].data.any_value + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,24 +85,24 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set, } void -TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the supplier proxy. - this->consumer_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -125,24 +125,24 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void) } void -TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->pps_->disconnect_push_supplier (ACE_TRY_ENV); + this->pps_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the supplier proxy PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -150,8 +150,8 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE } void -TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) @@ -172,16 +172,16 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer // @@ This code is not exception safe. RtecEventComm::PushConsumer_ptr rtecpushconsumer = - auto_wrapper.get ()->_this (ACE_TRY_ENV); + auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // give the ownership to the POA. - auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV); + auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->pps_->connect_push_consumer (rtecpushconsumer, - this->qos_, - ACE_TRY_ENV); + this->qos_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->wrapper_ = auto_wrapper.release (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index 9ed4a9e2aff..bf5a7416264 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -54,12 +54,12 @@ public: ~TAO_CosEC_ProxyPushSupplier_i (void); // Destructor. - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Ends the event communication and disposes this object. - virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV) + virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 64e839f82b4..688c8982937 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer = - this->rtec_supplieradmin_->obtain_push_consumer (ACE_TRY_ENV); + this->rtec_supplieradmin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer; @@ -46,11 +46,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV auto_proxyconsumer (proxypushconsumer); CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj = - auto_proxyconsumer.get ()->_this (ACE_TRY_ENV); + auto_proxyconsumer.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); // give the ownership to the POA. - auto_proxyconsumer.get ()->_remove_ref (ACE_TRY_ENV); + auto_proxyconsumer.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); auto_proxyconsumer.release (); @@ -58,7 +58,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &) +TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 8150bbb2e90..04ea411c3fc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -57,12 +57,12 @@ public: // error. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushConsumer_ptr. virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV) + obtain_pull_consumer(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullConsumer_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index 9f849ec75bc..99589e9178e 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -9,16 +9,16 @@ main (int argc, char *argv []) { Basic basic; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - basic.init (argc, argv, ACE_TRY_ENV); + basic.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - basic.run (ACE_TRY_ENV); + basic.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - basic.shutdown (ACE_TRY_ENV); + basic.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) @@ -50,29 +50,29 @@ Basic::~Basic (void) } void -Basic::init (int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) +Basic::init (int argc, char *argv[] + TAO_ENV_ARG_DECL) { - this->init_ORB (argc, argv, ACE_TRY_ENV); + this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->init_CosEC (ACE_TRY_ENV); + this->init_CosEC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Basic::init_ORB (int argc, char *argv [], - CORBA::Environment &ACE_TRY_ENV) +Basic::init_ORB (int argc, char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -80,20 +80,20 @@ Basic::init_ORB (int argc, char *argv [], " (%P|%t) Unable to initialize the POA.\n")); root_poa_ = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV) +Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL) { CosEC_ServantBase *ec = 0; @@ -106,11 +106,11 @@ Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV) ec->init (this->root_poa_.in(), this->root_poa_.in(), - 0,0,0, - ACE_TRY_ENV); + 0,0,0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - int retval = ec->activate (ACE_TRY_ENV); + int retval = ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (retval == -1) @@ -118,39 +118,39 @@ Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV) // @@ look for more descriptive exception to throw here CORBA::Object_var obj = - this->root_poa_->servant_to_reference (ec, ACE_TRY_ENV); + this->root_poa_->servant_to_reference (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->cos_ec_ = - CosEventChannelAdmin::EventChannel::_narrow (obj._retn (), - ACE_TRY_ENV); + CosEventChannelAdmin::EventChannel::_narrow (obj._retn () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Basic::run (CORBA::Environment &ACE_TRY_ENV) +Basic::run (TAO_ENV_SINGLE_ARG_DECL) { // Create an Any type to pass to the Cos EC. CORBA::Any any; any <<= (CORBA::Long)50; this->consumer_.open (this->cos_ec_.in (), - this->orb_.in (), - ACE_TRY_ENV); + this->orb_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (ACE_TRY_ENV); + this->consumer_.connect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier_.open (this->cos_ec_.in (), - ACE_TRY_ENV); + this->supplier_.open (this->cos_ec_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_.connect (ACE_TRY_ENV); + this->supplier_.connect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier_.send_event (any, - ACE_TRY_ENV); + this->supplier_.send_event (any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // this->orb_->run (); @@ -163,14 +163,14 @@ Basic::run (CORBA::Environment &ACE_TRY_ENV) } void -Basic::shutdown (CORBA::Environment &ACE_TRY_ENV) +Basic::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->supplier_.close (ACE_TRY_ENV); + this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.close (ACE_TRY_ENV); + this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->cos_ec_->destroy (ACE_TRY_ENV); + this->cos_ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h index 7003df0dc61..d504ea9ddc7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h @@ -36,23 +36,23 @@ public: ~Basic (void); // Destructor. - void init (int argc, char *argv[],CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv[] TAO_ENV_ARG_DECL); // Starts up an ORB and the CosEC. // Returns 0 on success, -1 on error. - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Connects a consumer and a supplier to the CosEC and sends 1 event // across. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Closes down the CosEC. private: - void init_ORB (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv[] TAO_ENV_ARG_DECL); // initializes the ORB. // Returns 0 on success, -1 on error. - void init_CosEC (CORBA::Environment &ACE_TRY_ENV); + void init_CosEC (TAO_ENV_SINGLE_ARG_DECL); // initializes the COS EC. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp index 44bdfb9e7fd..7b31e7d4f58 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp @@ -5,21 +5,21 @@ void Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::ORB_ptr orb, - CORBA::Environment& ACE_TRY_ENV) + CORBA::ORB_ptr orb + TAO_ENV_ARG_DECL) { this->orb_ = orb; // = Connect as a consumer. this->consumer_admin_ = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Consumer::close (CORBA::Environment &ACE_TRY_ENV) +Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_admin_ = @@ -27,32 +27,32 @@ Consumer::close (CORBA::Environment &ACE_TRY_ENV) } void -Consumer::connect (CORBA::Environment &ACE_TRY_ENV) +Consumer::connect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; CosEventComm::PushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier_proxy_->connect_push_consumer (objref.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -60,8 +60,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -Consumer::push (const CORBA::Any &, - CORBA::Environment &) +Consumer::push (const CORBA::Any & + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -74,7 +74,7 @@ Consumer::push (const CORBA::Any &, } void -Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -82,15 +82,15 @@ Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index b6fc3584905..9c66fc562eb 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -33,29 +33,29 @@ class Consumer : public POA_CosEventComm::PushConsumer public: void open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::ORB_ptr orb, - CORBA::Environment& ACE_TRY_ENV); + CORBA::ORB_ptr orb + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (CORBA::Environment &ACE_TRY_ENV); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (CORBA::Environment &ACE_TRY_ENV); + void connect (TAO_ENV_SINGLE_ARG_DECL); // Connect the Consumer to the EventChannel. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. - virtual void push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV) + virtual void push (const CORBA::Any &data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )); // push the event to the consumer. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp index 903fd57b924..3293d16514d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp @@ -4,19 +4,19 @@ #include "Supplier.h" void -Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& ACE_TRY_ENV) +Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL) { // = Connect as a consumer. this->supplier_admin_ = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Supplier::close (CORBA::Environment &ACE_TRY_ENV) +Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_admin_ = @@ -24,31 +24,31 @@ Supplier::close (CORBA::Environment &ACE_TRY_ENV) } void -Supplier::connect (CORBA::Environment &ACE_TRY_ENV) +Supplier::connect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV); + this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_proxy_->connect_push_supplier (objref.in (), - ACE_TRY_ENV); + this->consumer_proxy_->connect_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -56,15 +56,15 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -Supplier::send_event (const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV) +Supplier::send_event (const CORBA::Any & data + TAO_ENV_ARG_DECL) { - this->consumer_proxy_->push (data, ACE_TRY_ENV); + this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -72,15 +72,15 @@ Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 90a0bea70e9..7e96e452ddb 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -31,23 +31,23 @@ class Supplier : public POA_CosEventComm::PushSupplier // The Supplier is a simple Push Supplier that connects to // the CosEC and sends events to it. public: - void open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment &ACE_TRY_ENV); + void open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (CORBA::Environment &ACE_TRY_ENV); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (CORBA::Environment &ACE_TRY_ENV); + void connect (TAO_ENV_SINGLE_ARG_DECL); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, but do not forget about it or close it. - void send_event (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV); + void send_event (const CORBA::Any &data + TAO_ENV_ARG_DECL); // Send one event. - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 75634dcfc3c..cb2a02f80c8 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -44,19 +44,19 @@ Consumer::parse_args (int argc, char *argv []) } void -Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& ACE_TRY_ENV) +Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL) { // = Connect as a consumer. this->consumer_admin_ = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Consumer::close (CORBA::Environment &ACE_TRY_ENV) +Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_admin_ = @@ -64,32 +64,32 @@ Consumer::close (CORBA::Environment &ACE_TRY_ENV) } void -Consumer::connect (CORBA::Environment &ACE_TRY_ENV) +Consumer::connect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; CosEventComm::PushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier_proxy_->connect_push_consumer (objref.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -97,8 +97,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -Consumer::push (const CORBA::Any &, - CORBA::Environment &ACE_TRY_ENV) +Consumer::push (const CORBA::Any & + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &, "(%P):%s\n", "exiting the consumer.")); - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->shutdown (); @@ -129,7 +129,7 @@ Consumer::push (const CORBA::Any &, } void -Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -137,30 +137,30 @@ Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } int Consumer::init_Consumer (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->open (this->cos_ec_, - ACE_TRY_ENV); + this->open (this->cos_ec_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect (ACE_TRY_ENV); + this->connect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index cb05f223e2b..fdfed82b2b6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -40,29 +40,29 @@ public: int init_Consumer (void); // Initialize the Consumer. - void open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& ACE_TRY_ENV); + void open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (CORBA::Environment &ACE_TRY_ENV); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (CORBA::Environment &ACE_TRY_ENV); + void connect (TAO_ENV_SINGLE_ARG_DECL); // Connect the Consumer to the EventChannel. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. - virtual void push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV) + virtual void push (const CORBA::Any &data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )); // push the event to the consumer. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index 63f8931ea7e..eb1b5231c54 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -39,18 +39,18 @@ Multiple::init (int argc, char *argv[]) int Multiple::init_ORB (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -59,15 +59,15 @@ Multiple::init_ORB (int argc, char *argv []) -1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,7 +85,7 @@ Multiple::init_ORB (int argc, char *argv []) int Multiple::init_CosEC (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialization of the naming service. @@ -101,16 +101,16 @@ Multiple::init_CosEC (void) CORBA::string_dup (this->service_name); CORBA::Object_var EC_obj = - this->naming_client_->resolve (ec_ref_name, - ACE_TRY_ENV); + this->naming_client_->resolve (ec_ref_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to // CosEventChannelAdmin::EventChannel // using the <_narrow> method. this->cos_ec_ = - CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in (), - ACE_TRY_ENV); + CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -128,10 +128,10 @@ Multiple::init_CosEC (void) int Multiple::runORB (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index 7e820a11853..f549159e1b7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -43,19 +43,19 @@ Supplier::parse_args (int argc, char *argv []) } void -Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& ACE_TRY_ENV) +Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL) { // = Connect as a consumer. this->supplier_admin_ = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Supplier::close (CORBA::Environment &ACE_TRY_ENV) +Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_admin_ = @@ -63,31 +63,31 @@ Supplier::close (CORBA::Environment &ACE_TRY_ENV) } void -Supplier::connect (CORBA::Environment &ACE_TRY_ENV) +Supplier::connect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV); + this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_proxy_->connect_push_supplier (objref.in (), - ACE_TRY_ENV); + this->consumer_proxy_->connect_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -95,15 +95,15 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -Supplier::send_event (const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV) +Supplier::send_event (const CORBA::Any & data + TAO_ENV_ARG_DECL) { - this->consumer_proxy_->push (data, ACE_TRY_ENV); + this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -111,23 +111,23 @@ Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Supplier::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create an Any type to pass to the Cos EC. @@ -136,11 +136,11 @@ Supplier::run (void) CORBA::Any any; cany >>= any; - this->open (this->cos_ec_, - ACE_TRY_ENV); + this->open (this->cos_ec_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect (ACE_TRY_ENV); + this->connect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -151,15 +151,15 @@ Supplier::run (void) count != 0; count--) { - this->send_event (any, - ACE_TRY_ENV); + this->send_event (any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "(%P):Done!. exiting now..\n")); - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 9c6c0f60e83..9de704696bd 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -37,23 +37,23 @@ public: Supplier (); // Constructor. - void open (CosEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment &ACE_TRY_ENV); + void open (CosEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (CORBA::Environment &ACE_TRY_ENV); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (CORBA::Environment &ACE_TRY_ENV); + void connect (TAO_ENV_SINGLE_ARG_DECL); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, but do not forget about it or close it. - void send_event (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV); + void send_event (const CORBA::Any &data + TAO_ENV_ARG_DECL); // Send one event. - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index ff7e31746ae..c425e7c6bdb 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -23,15 +23,15 @@ Consumer::Consumer (void) int Consumer::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Do *NOT* make a copy because we don't want the ORB to outlive + // Do *NOT* make a copy because we don't want the ORB to outlive // the Consumer object. this->orb_ = orb.in (); @@ -43,46 +43,46 @@ Consumer::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - CosEventChannelAdmin::EventChannel::_narrow (object.in (), - ACE_TRY_ENV); + CosEventChannelAdmin::EventChannel::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier->connect_push_consumer (consumer.in (), ACE_TRY_ENV); + supplier->connect_push_consumer (consumer.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Wait for events, using work_pending()/perform_work() may help + // Wait for events, using work_pending()/perform_work() may help // or using another thread, this example is too simple for that. orb->run (); @@ -103,8 +103,8 @@ Consumer::run (int argc, char* argv[]) } void -Consumer::push (const CORBA::Any &, - CORBA::Environment &) +Consumer::push (const CORBA::Any & + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count_ ++; @@ -117,13 +117,13 @@ Consumer::push (const CORBA::Any &, } void -Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 2897e12f086..4ef9e96d7ce 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -40,10 +40,10 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any &event, - CORBA::Environment &) + virtual void push (const CORBA::Any &event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index c4b09bda47e..c13a78fe03b 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -15,12 +15,12 @@ main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -31,30 +31,30 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_EventChannel_Attributes attributes (poa.in (), poa.in ()); TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (event_channel.in (), ACE_TRY_ENV); + orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 66d7d1a9647..63476ce6f9e 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -22,12 +22,12 @@ Supplier::Supplier (void) int Supplier::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc <= 1) @@ -38,43 +38,43 @@ Supplier::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - CosEventChannelAdmin::EventChannel::_narrow (object.in (), - ACE_TRY_ENV); + CosEventChannelAdmin::EventChannel::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushConsumer_var consumer = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer->connect_push_supplier (supplier.in (), ACE_TRY_ENV); + consumer->connect_push_supplier (supplier.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Push the events... @@ -85,28 +85,28 @@ Supplier::run (int argc, char* argv[]) for (int i = 0; i != 2000; ++i) { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (sleep_time); } // Disconnect from the EC - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the EC.... - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate this object... PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA - poa->destroy (1, 0, ACE_TRY_ENV); + poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -119,7 +119,7 @@ Supplier::run (int argc, char* argv[]) } void -Supplier::disconnect_push_supplier (CORBA::Environment &) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 2e4bcb2cc21..ba082729cc7 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -40,7 +40,7 @@ public: // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index 8ba44609759..cc5a8a9014e 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -28,37 +28,37 @@ FilterClient::~FilterClient () } void -FilterClient::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +FilterClient::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { - init_ORB (argc, argv, ACE_TRY_ENV); + init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (ACE_TRY_ENV); + resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (ACE_TRY_ENV); + resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (ACE_TRY_ENV); + create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (ACE_TRY_ENV); + create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (ACE_TRY_ENV); + create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (ACE_TRY_ENV); + create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (ACE_TRY_ENV); + create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::run (CORBA::Environment &ACE_TRY_ENV) +FilterClient::run (TAO_ENV_SINGLE_ARG_DECL) { - send_events (ACE_TRY_ENV); + send_events (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE) @@ -77,18 +77,18 @@ FilterClient::done (void) void FilterClient::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -98,24 +98,24 @@ FilterClient::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object, - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object + TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (NAMING_SERVICE_NAME, - ACE_TRY_ENV); + this->orb_->resolve_initial_references (NAMING_SERVICE_NAME + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -123,60 +123,60 @@ FilterClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV) +FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_EC (CORBA::Environment &ACE_TRY_ENV) +FilterClient::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -FilterClient::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV) +FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (ACE_TRY_ENV); + ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var sa_filter = - ffact->create_filter (TCL_GRAMMAR, ACE_TRY_ENV); + ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (sa_filter.in ())); @@ -187,31 +187,31 @@ FilterClient::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER); - sa_filter->add_constraints (constraint_list, ACE_TRY_ENV); + sa_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_admin_->add_filter (sa_filter.in (), ACE_TRY_ENV); + supplier_admin_->add_filter (sa_filter.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) +FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (ACE_TRY_ENV); + ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var ca_filter = - ffact->create_filter (TCL_GRAMMAR, ACE_TRY_ENV); + ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ca_filter.in ())); @@ -227,10 +227,10 @@ FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER); - ca_filter->add_constraints (constraint_list, ACE_TRY_ENV); + ca_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_admin_->add_filter (ca_filter.in (), ACE_TRY_ENV); + consumer_admin_->add_filter (ca_filter.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the CA to receive all type of events @@ -242,19 +242,19 @@ FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_consumers (CORBA::Environment &ACE_TRY_ENV) +FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL) { // startup the first consumer. ACE_NEW_THROW_EX (consumer_1, Filter_StructuredPushConsumer (this, "consumer1"), CORBA::NO_MEMORY ()); - consumer_1->connect (consumer_admin_.in (), ACE_TRY_ENV); + consumer_1->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second consumer. @@ -262,19 +262,19 @@ FilterClient::create_consumers (CORBA::Environment &ACE_TRY_ENV) Filter_StructuredPushConsumer (this, "consumer2"), CORBA::NO_MEMORY ()); - consumer_2->connect (consumer_admin_.in (), ACE_TRY_ENV); + consumer_2->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_suppliers (CORBA::Environment &ACE_TRY_ENV) +FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) { // startup the first supplier ACE_NEW_THROW_EX (supplier_1, Filter_StructuredPushSupplier ("supplier1"), CORBA::NO_MEMORY ()); - supplier_1->connect (supplier_admin_.in (), ACE_TRY_ENV); + supplier_1->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second supplier @@ -282,12 +282,12 @@ FilterClient::create_suppliers (CORBA::Environment &ACE_TRY_ENV) Filter_StructuredPushSupplier ("supplier2"), CORBA::NO_MEMORY ()); - supplier_2->connect (supplier_admin_.in (), ACE_TRY_ENV); + supplier_2->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::send_events (CORBA::Environment &ACE_TRY_ENV) +FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL) { // operations: CosNotification::StructuredEvent event; @@ -332,10 +332,10 @@ FilterClient::send_events (CORBA::Environment &ACE_TRY_ENV) // any event.remainder_of_body <<= (CORBA::Long)i; - supplier_1->send_event (event, ACE_TRY_ENV); + supplier_1->send_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_2->send_event (event, ACE_TRY_ENV); + supplier_2->send_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -352,15 +352,15 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void) } void -Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -368,27 +368,29 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (objref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_structured_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Filter_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_TRY_ENV); + disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +Filter_StructuredPushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -398,7 +400,9 @@ Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq } void -Filter_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +Filter_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -423,7 +427,8 @@ Filter_StructuredPushConsumer::push_structured_event (const CosNotification::Str } void -Filter_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/) +Filter_StructuredPushConsumer::disconnect_structured_push_consumer + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -444,41 +449,43 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier () } void -Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_structured_push_supplier (objref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_structured_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Filter_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); } void -Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/ - ) +Filter_StructuredPushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -488,19 +495,21 @@ Filter_StructuredPushSupplier::subscription_change (const CosNotification::Event } void -Filter_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV) +Filter_StructuredPushSupplier::send_event + (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); ACE_DEBUG ((LM_DEBUG, "%s is sending an event \n", my_name_.fast_rep ())); - proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/) +Filter_StructuredPushSupplier::disconnect_structured_push_supplier + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 35fd599f4b5..6054e2bd1ab 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -46,41 +46,41 @@ class FilterClient ~FilterClient (); // Destructor - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // Init the Client. - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Consumer calls done, We're done. protected: - void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV); + void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV); + void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV); + void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (CORBA::Environment &ACE_TRY_ENV); + void create_consumers (TAO_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (CORBA::Environment &ACE_TRY_ENV); + void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (CORBA::Environment &ACE_TRY_ENV); + void send_events (TAO_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -145,11 +145,11 @@ class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushCo Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. protected: @@ -174,8 +174,8 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -184,8 +184,8 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -193,7 +193,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -215,16 +215,16 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu Filter_StructuredPushSupplier (const char* my_name); // Constructor. - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - virtual void send_event (const CosNotification::StructuredEvent& event, - CORBA::Environment &ACE_TRY_ENV); + virtual void send_event (const CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL); // Send one event. protected: @@ -245,8 +245,8 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -255,7 +255,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 8304eee4f45..3957d8425e5 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -10,11 +10,11 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - client.init (argc, argv, - ACE_TRY_ENV); //Init the Client + client.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (ACE_TRY_ENV); + client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 9ee389f0ce4..13af016f3b7 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -30,30 +30,30 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { - init_ORB (argc, argv, ACE_TRY_ENV); + init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (ACE_TRY_ENV); + resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (ACE_TRY_ENV); + resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (ACE_TRY_ENV); + create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (ACE_TRY_ENV); + create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (ACE_TRY_ENV); + create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (ACE_TRY_ENV); + create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (ACE_TRY_ENV); + create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::run (CORBA::Environment &ACE_TRY_ENV) +Subscribe::run (TAO_ENV_SINGLE_ARG_DECL) { - this->send_events (ACE_TRY_ENV); + this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb. @@ -72,18 +72,18 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (NAMING_SERVICE_NAME, - ACE_TRY_ENV); + this->orb_->resolve_initial_references (NAMING_SERVICE_NAME + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -117,96 +117,96 @@ Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV) +Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_EC (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Subscribe::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -Subscribe:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) +Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -Subscribe::create_consumers (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL) { consumer_1_ = new Subscribe_StructuredPushConsumer (this); - consumer_1_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + consumer_1_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_2_ = new Subscribe_StructuredPushConsumer (this); - consumer_2_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + consumer_2_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_suppliers (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) { supplier_1_ = new Subscribe_StructuredPushSupplier (); - supplier_1_->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + supplier_1_->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; supplier_2_ = new Subscribe_StructuredPushSupplier (); - supplier_2_->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + supplier_2_->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) +Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -220,7 +220,7 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) removed[0].domain_name = CORBA::string_dup ("*"); removed[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b" @@ -232,8 +232,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) added_1.length (1); removed_1.length (0); - this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1, - ACE_TRY_ENV); + this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c" @@ -245,8 +245,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) added_2.length (1); removed_2.length (0); - this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2, - ACE_TRY_ENV); + this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the events - one of each type @@ -286,11 +286,11 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) // let supplier 1 send all these events for (int i = 0; i < 1; ++i) { - supplier_1_->send_event (event1, ACE_TRY_ENV); + supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event2, ACE_TRY_ENV); + supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event3, ACE_TRY_ENV); + supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -306,15 +306,17 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer () } void -Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushConsumer::connect + (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -322,27 +324,29 @@ Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (objref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_structured_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_TRY_ENV); + disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +Subscribe_StructuredPushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -352,7 +356,9 @@ Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventType } void -Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -372,7 +378,8 @@ Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification:: } void -Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -397,41 +404,45 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier () } void -Subscribe_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::connect + (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_structured_push_supplier (objref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_structured_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); } void -Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/ - ) +Subscribe_StructuredPushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -441,16 +452,19 @@ Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::Ev } void -Subscribe_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::send_event + (const CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index e2b1d0ad833..37124da02eb 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -42,41 +42,41 @@ class Subscribe Subscribe (void); ~Subscribe (); - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // Init the Client. - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Called when all events we are waiting for have occured. protected: - void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV); + void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV); + void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV); + void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (CORBA::Environment &ACE_TRY_ENV); + void create_consumers (TAO_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (CORBA::Environment &ACE_TRY_ENV); + void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (CORBA::Environment &ACE_TRY_ENV); + void send_events (TAO_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -135,11 +135,11 @@ class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPus Subscribe_StructuredPushConsumer (Subscribe* subscribe); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); @@ -163,8 +163,8 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -173,8 +173,8 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -182,7 +182,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -204,16 +204,16 @@ class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPus Subscribe_StructuredPushSupplier (void); // Constructor. - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - virtual void send_event (const CosNotification::StructuredEvent& event, - CORBA::Environment &ACE_TRY_ENV); + virtual void send_event (const CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL); // Send one event. protected: @@ -231,8 +231,8 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -241,7 +241,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index 70dba60011e..e7e5550a01e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -10,11 +10,11 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - client.init (argc, argv, - ACE_TRY_ENV); //Init the Client + client.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (ACE_TRY_ENV); + client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp index 03988761554..bfa2b4e8bd8 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp @@ -11,8 +11,8 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment&) + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h index a75f2a774ce..fc3610771df 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h @@ -40,8 +40,8 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment&) + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index eef1b14038d..c6e79b3ef6b 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -12,15 +12,15 @@ Consumer::Consumer (void) } void -Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV) +Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL) { this->proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var me = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Simple subscription, but usually the helper classes in @@ -39,18 +39,18 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, h1.type = ACE_ES_EVENT_UNDEFINED; // first free event type h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - this->proxy_->connect_push_consumer (me.in (), qos, - ACE_TRY_ENV); + this->proxy_->connect_push_consumer (me.in (), qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Disconnect from the proxy - this->proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -62,20 +62,20 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) // Deactivate this object PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Deactivate the object - poa->deactivate_object (oid.in (), ACE_TRY_ENV); + poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -95,7 +95,7 @@ Consumer::push (const RtecEventComm::EventSet& events, } void -Consumer::disconnect_push_consumer (CORBA::Environment &) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index 69bd65ab206..c71328b15d4 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -37,19 +37,19 @@ public: Consumer (void); // Constructor - void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL); // Connect to the Event Channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the event channel // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 187b799e1ae..3e1348e7544 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "Consumer.h" #include "Supplier.h" #include "AddrServer.h" @@ -11,7 +12,9 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID(EC_Examples, MCast, "$Id$") +ACE_RCSID (EC_Examples, + MCast, + "$Id$") const char *udp_mcast_address = ACE_DEFAULT_MULTICAST_ADDR ":10001"; @@ -34,32 +37,24 @@ main (int argc, char* argv[]) // // and defined in: // - // $ACE_ROOT/ace/CORBA_macros.h + // $ACE_ROOT/TAO/tao/orbconf.h - for Environment parameter definitions + // + // $ACE_ROOT/ace/CORBA_macros.h - for try/catch et al. // // If your platform supports native exceptions, and TAO was compiled // with native exception support then you can simply use try/catch - // and avoid the ACE_TRY_ENV argument. + // and avoid the TAO_ENV_SINGLE_ARG_PARAMETER argument. // Unfortunately many embedded systems cannot use exceptions due to // the space and time overhead. // - // This would be OK except for the fact that event channel library - // is compiled with support for platforms without exceptions, so - // some of the classes (the consumers and suppliers), must receive - // the extra CORBA::Environment argument. - // In platforms with native C++ exception support the argument must - // be present, but it can be ignored, and the standard C++ exception - // mechanisms can be used instead. - // Still we are workin on some way to avoid the extra argument - // altogether, at least for platforms that do not require it. - // - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // **************** HERE STARTS THE ORB SETUP // Create the ORB, pass the argv list for parsing. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments, you usually want to do this after @@ -77,15 +72,15 @@ main (int argc, char* argv[]) // The POA starts in the holding state, if it is not activated // it will not process any requests. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETS THE ORB SETUP @@ -108,14 +103,14 @@ main (int argc, char* argv[]) // that may involve creating some threads. // But it should always be invoked because several internal data // structures are initialized at that point. - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The event channel is activated as any other CORBA servant. // In this case we use the simple implicit activation with the // RootPOA RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP @@ -152,7 +147,7 @@ main (int argc, char* argv[]) // Now we create and activate the servant AddrServer as_impl (addr); RtecUDPAdmin::AddrServer_var address_server = - as_impl._this (ACE_TRY_ENV); + as_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We need a local socket to send the data, open it and check @@ -168,8 +163,8 @@ main (int argc, char* argv[]) TAO_ECG_UDP_Sender sender; sender.init (event_channel.in (), address_server.in (), - &endpoint, - ACE_TRY_ENV); + &endpoint + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now we connect the sender as a consumer of events, it will @@ -184,7 +179,7 @@ main (int argc, char* argv[]) sub.dependencies[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - sender.open (sub, ACE_TRY_ENV); + sender.open (sub TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // To receive events we need to setup an event handler: @@ -201,8 +196,8 @@ main (int argc, char* argv[]) // required by all the local consumer. // Then it register for the multicast groups that carry those // events: - int r = mcast_eh.open (event_channel.in (), - ACE_TRY_ENV); + int r = mcast_eh.open (event_channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) { @@ -225,8 +220,8 @@ main (int argc, char* argv[]) address_server.in (), orb->orb_core ()->reactor (), expire, - max_expiration_count, - ACE_TRY_ENV); + max_expiration_count + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The Receiver is also a supplier of events. The exact type of @@ -246,7 +241,7 @@ main (int argc, char* argv[]) pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; pub.is_gateway = 1; - receiver.open (pub, ACE_TRY_ENV); + receiver.open (pub TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE FEDERATION SETUP @@ -257,19 +252,19 @@ main (int argc, char* argv[]) // channel Consumer consumer; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // And now create a supplier Supplier supplier; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE CLIENT SETUP @@ -282,7 +277,7 @@ main (int argc, char* argv[]) for (int i = 0; i != 1000; ++i) { CORBA::Boolean there_is_work = - orb->work_pending (ACE_TRY_ENV); + orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (there_is_work) { @@ -291,12 +286,12 @@ main (int argc, char* argv[]) // perform_work() or work_pending(), so just calling // them results in a spin loop. ACE_Time_Value tv (0, 50000); - orb->perform_work (tv, ACE_TRY_ENV); + orb->perform_work (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_Time_Value tv (0, 100000); ACE_OS::sleep (tv); - supplier.perform_push (ACE_TRY_ENV); + supplier.perform_push (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -305,16 +300,16 @@ main (int argc, char* argv[]) // **************** HERE STARTS THE CLEANUP CODE // First the easy ones - supplier.disconnect (ACE_TRY_ENV); + supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer.disconnect (ACE_TRY_ENV); + consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now let us close the Receiver - receiver.close (ACE_TRY_ENV); + receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - r = mcast_eh.close (ACE_TRY_ENV); + r = mcast_eh.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) { @@ -323,13 +318,13 @@ main (int argc, char* argv[]) } // And also close the sender of events - sender.close (ACE_TRY_ENV); + sender.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The event channel must be destroyed, so it can release its // resources, and inform all the clients that are still // connected that it is going away. - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivating the event channel implementation is not strictly @@ -341,24 +336,24 @@ main (int argc, char* argv[]) // is the root POA, but the code is more robust if we don't // rely on that. PortableServer::POA_var poa = - ec_impl._default_POA (ACE_TRY_ENV); + ec_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (&ec_impl, ACE_TRY_ENV); + poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate the object - poa->deactivate_object (oid.in (), ACE_TRY_ENV); + poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Finally destroy the ORB - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE CLEANUP CODE diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index a23d243809e..1904326e03e 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -11,15 +11,15 @@ Supplier::Supplier (void) } void -Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV) +Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL) { this->proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var me = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Simple publication, but usually the helper classes in @@ -33,18 +33,18 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, h0.type = ACE_ES_EVENT_UNDEFINED; // first free event type h0.source = 1; // first free event source - this->proxy_->connect_push_supplier (me.in (), qos, - ACE_TRY_ENV); + this->proxy_->connect_push_supplier (me.in (), qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { // Disconnect from the EC ACE_TRY { - this->proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -53,17 +53,17 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_ENDTRY; PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV) +Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -75,7 +75,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV) // Avoid loops throught the event channel federations event[0].header.ttl = 1; - this->proxy_->push (event, ACE_TRY_ENV); + this->proxy_->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,7 +85,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV) } void -Supplier::disconnect_push_supplier (CORBA::Environment &) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index 35743ec5bb4..a8d6c6ff31d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -38,19 +38,19 @@ public: Supplier (void); // Constructor - void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); // Connect to the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the event channel - void perform_push (CORBA::Environment &ACE_TRY_ENV); + void perform_push (TAO_ENV_SINGLE_ARG_DECL); // Push a single event // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp index 8b5f1b76dfa..4793a20ab13 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp @@ -9,8 +9,8 @@ Consumer::Consumer (void) } void -Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events, } void -Consumer::disconnect_push_consumer (CORBA::Environment &) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index 58c7e18af17..20c1ffad011 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -44,10 +44,10 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. }; diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 5ec946fc760..a5e70795367 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -30,12 +30,12 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -46,15 +46,15 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -62,11 +62,11 @@ main (int argc, char* argv[]) #if 0 // Obtain a reference to the naming service... CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -93,7 +93,7 @@ main (int argc, char* argv[]) } RtecScheduler::Scheduler_var scheduler = - sched_impl->_this (ACE_TRY_ENV); + sched_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if 0 @@ -105,8 +105,8 @@ main (int argc, char* argv[]) schedule_name.length (1); schedule_name[0].id = CORBA::string_dup ("ScheduleService"); // Register the servant with the Naming Context.... - naming_context->rebind (schedule_name, scheduler.in (), - ACE_TRY_ENV); + naming_context->rebind (schedule_name, scheduler.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -121,7 +121,7 @@ main (int argc, char* argv[]) &module_factory); RtecEventChannelAdmin::EventChannel_var event_channel = - event_channel_impl._this (ACE_TRY_ENV); + event_channel_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #else @@ -131,12 +131,12 @@ main (int argc, char* argv[]) TAO_EC_Event_Channel ec_impl (attributes); ACE_DEBUG ((LM_DEBUG, "activating EC\n")); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC activated\n")); RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -148,7 +148,7 @@ main (int argc, char* argv[]) Consumer consumer_impl; RtecScheduler::handle_t consumer_rt_info1 = - scheduler->create ("consumer_event_1", ACE_TRY_ENV); + scheduler->create ("consumer_event_1" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Let's say that the execution time for event 1 is 2 @@ -163,12 +163,12 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::handle_t consumer_rt_info2 = - scheduler->create ("consumer_event_2", ACE_TRY_ENV); + scheduler->create ("consumer_event_2" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Let's say that the execution time for event 2 is 1 @@ -182,8 +182,8 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ConsumerQOS_Factory consumer_qos; @@ -197,21 +197,21 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer = - consumer_impl._this (ACE_TRY_ENV); + consumer_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting consumer\n")); supplier_proxy->connect_push_consumer (consumer.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "consumer connected\n")); @@ -220,7 +220,7 @@ main (int argc, char* argv[]) Supplier supplier_impl; RtecScheduler::handle_t supplier_rt_info1 = - scheduler->create ("supplier_event_1", ACE_TRY_ENV); + scheduler->create ("supplier_event_1" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The execution times are set to reasonable values, but @@ -239,12 +239,12 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, 0, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::handle_t supplier_rt_info2 = - scheduler->create ("supplier_event_2", ACE_TRY_ENV); + scheduler->create ("supplier_event_2" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The execution times are set to reasonable values, but @@ -262,8 +262,8 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, 0, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::EventSourceID supplier_id = 1; @@ -279,21 +279,21 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier = - supplier_impl._this (ACE_TRY_ENV); + supplier_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting supplier\n")); consumer_proxy->connect_push_supplier (supplier.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "supplier connected\n")); @@ -329,8 +329,8 @@ main (int argc, char* argv[]) max_os_priority, infos.out (), configs.out (), - anomalies.out (), - ACE_TRY_ENV); + anomalies.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Dump the schedule to a file.. @@ -362,12 +362,12 @@ main (int argc, char* argv[]) { if (i % 2 == 0) { - consumer_proxy->push (event1, ACE_TRY_ENV); + consumer_proxy->push (event1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { - consumer_proxy->push (event2, ACE_TRY_ENV); + consumer_proxy->push (event2 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index 921f5d7c1bf..f60d585f1ec 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -9,7 +9,7 @@ Supplier::Supplier (void) } void -Supplier::disconnect_push_supplier (CORBA::Environment &) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index a75bdd5b416..e6139801c49 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -44,7 +44,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index dc8e1a26b29..d0d81303d5c 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -24,15 +24,15 @@ Consumer::Consumer (void) int Consumer::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Do *NOT* make a copy because we don't want the ORB to outlive + // Do *NOT* make a copy because we don't want the ORB to outlive // the run() method. this->orb_ = orb.in (); @@ -44,40 +44,40 @@ Consumer::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - RtecEventChannelAdmin::EventChannel::_narrow (object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple subscription, but usually the helper classes in @@ -94,11 +94,11 @@ Consumer::run (int argc, char* argv[]) h1.type = ACE_ES_EVENT_UNDEFINED; // first free event type h1.source = ACE_ES_EVENT_SOURCE_ANY; - supplier->connect_push_consumer (consumer.in (), qos, - ACE_TRY_ENV); + supplier->connect_push_consumer (consumer.in (), qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Wait for events, using work_pending()/perform_work() may help + // Wait for events, using work_pending()/perform_work() may help // or using another thread, this example is too simple for that. orb->run (); @@ -119,8 +119,8 @@ Consumer::run (int argc, char* argv[]) } void -Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -140,13 +140,13 @@ Consumer::push (const RtecEventComm::EventSet& events, } void -Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index 352096048f1..e7dfda0c32a 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -41,10 +41,10 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 5df20ad8a45..e1631f7dcae 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -15,12 +15,12 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -31,30 +31,30 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attributes (poa.in (), poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (event_channel.in (), ACE_TRY_ENV); + orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 831128a3620..32ea062d450 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -23,12 +23,12 @@ Supplier::Supplier (void) int Supplier::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc <= 1) @@ -39,40 +39,40 @@ Supplier::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - RtecEventChannelAdmin::EventChannel::_narrow (object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var consumer = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple publication, but usually the helper classes in @@ -84,8 +84,8 @@ Supplier::run (int argc, char* argv[]) h0.type = ACE_ES_EVENT_UNDEFINED; // first free event type h0.source = 1; // first free event source - consumer->connect_push_supplier (supplier.in (), qos, - ACE_TRY_ENV); + consumer->connect_push_supplier (supplier.in (), qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Push the events... @@ -99,28 +99,28 @@ Supplier::run (int argc, char* argv[]) for (int i = 0; i != 2000; ++i) { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (sleep_time); } // Disconnect from the EC - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the EC.... - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate this object... PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA - poa->destroy (1, 0, ACE_TRY_ENV); + poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[]) } void -Supplier::disconnect_push_supplier (CORBA::Environment &) +Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index 7410fc2d03b..72a72f74395 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -41,7 +41,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index f2c264f787f..bbef4bc291e 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -14,61 +14,61 @@ static int authorize_1 = 1; static int authorize_2 = 1; CORBA::Boolean -SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) +SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - + /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = - orb->resolve_initial_references ("SecurityCurrent", ACE_TRY_ENV); + orb->resolve_initial_references ("SecurityCurrent" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - /// Narrow it down correctly. + /// Narrow it down correctly. SecurityLevel1::Current_var current = SecurityLevel1::Current::_narrow (obj.in ()); - + /// Check for nil reference. if (CORBA::is_nil (current.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the SecurityCurrent object\n"), 1); - + Security::AttributeType desired_attribute_1; - + /// @@ Need to check more abt this variable desired_attribute.attribute_family.family_definer = 0; - + /// Implies Privilege Attributes desired_attribute.attribute_family.family = 1; - + /// AccessId: the identity of the principal used for access /// control desired_attribute.attibute_type = 2; // Second desired attribute Security::AttributeType desired_attribute_2; - + /// @@ Need to check more abt this variable desired_attribute.attribute_family.family_definer = 0; - + /// Implies Privilege Attributes. desired_attribute.attribute_family.family = 1; - + /// Primary Group ID. /// @@ I am not sure if Ossama will have all these attribute types /// If it is not the same, one might have to change the comments /// to show the attribute_type that is checked and change the /// number accordingly. desired_attribute.attibute_type = 3; - + /// Define the AttributeTypeList Security::AttributeTypeList attribute_type_list; attribute_type_list.length (2); attribute_type_list[0] = &desired_attribute_1; attribute_type_list[1] = &desired_attribute_2; - + /// Get the desired security attributes - Security::AttributeList_var attribute_list = + Security::AttributeList_var attribute_list = current->get_attributes (attribute_type_list); /* @@ What did we do till now ?? @@ -80,7 +80,7 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) * The type which is returned from the get_attribute method is a * sequence of the AttributeList struct. This struct has three * members: the attribute type, the defining_authority and the - * value of the attribute type. + * value of the attribute type. * * @@ What should we do now ?? * Compare the returned values with the values we, as in the @@ -91,7 +91,7 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) * which are valid to authorize access to the requested * invocation. Or complete this stuff with a single if condition * make things easier. - * + * */ if ((attribute_type == 1) && (attribute_value == 10)) @@ -99,8 +99,8 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) // Lets say, this is the valid case. authorize_1 = 0; } - - /// If the owner of this invocation is authorized to invoke this + + /// If the owner of this invocation is authorized to invoke this /// method, return 0 else return 1. if (authorize_1 == 0) return 0; @@ -110,10 +110,10 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) CORBA::Boolean -SLevel1_Server_i::authorize_level2 (CORBA::Environment &) +SLevel1_Server_i::authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - /// If the owner of this invocation is authorized to invoke this + /// If the owner of this invocation is authorized to invoke this /// method, return 0 else return 1. if (authorize_2 == 0) return 0; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index beec3b6d678..7448af5dadc 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (CORBA::Environment &) + CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean authorize_level2 (CORBA::Environment &) + CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); static int authorized_1; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 90e6c48b5a8..c61fc5f0f55 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -37,18 +37,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_var server = - SLevel1_Server::_narrow (object.in (), ACE_TRY_ENV); + SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -59,21 +59,21 @@ main (int argc, char *argv []) 1); } - CORBA::Boolean authorized = - server->authorize_level1 (ACE_TRY_ENV); + CORBA::Boolean authorized = + server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + if (authorized == 0) ACE_DEBUG ((LM_DEBUG, "AUTHORIZED\n")); else if (authorized == 1) ACE_DEBUG ((LM_DEBUG, "DENIED: You Do NOT have enough privileges\n")); - - server->shutdown (ACE_TRY_ENV); + + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,4 +86,4 @@ main (int argc, char *argv []) return 0; } - + diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index f96308403d4..7a70989ebf0 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -15,12 +15,12 @@ main (int argc, char *argv[]) { /// Our regular ORB Initialization. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get a reference to the RootPOA. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -30,37 +30,37 @@ main (int argc, char *argv[]) /// Narrow down the reference to the currect interface. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_i level1_server (); SLevel1_Server_var server = - level1_server._this (ACE_TRY_ENV); + level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), - ACE_TRY_ENV); + orb->object_to_string (server.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) - { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } // Start the ORB orb->run (); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 50283cca84f..d6358fbab54 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -67,15 +67,15 @@ main (int argc, char *argv[]) char *line = buf.read ('\n'); if (line == 0) break; - server->send_line (line, ACE_TRY_ENV); + server->send_line (line TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; buf.alloc ()->free (line); } - - server->shutdown (ACE_TRY_ENV); + + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index b7a6d2ee3eb..dac538f1328 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -17,13 +17,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = get_opts.optarg; - break; + ior_output_file = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-o <iorfile>" + "-o <iorfile>" "\n", argv [0]), -1); @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,37 +64,37 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_TRY_ENV); + server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) - { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - poa_manager->activate (ACE_TRY_ENV); + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 7066b59589b..c292b05581b 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -9,15 +9,15 @@ ACE_RCSID(Send_File, test_i, "$Id$") void -Simple_Server_i::send_line (const char *line, - CORBA::Environment&) +Simple_Server_i::send_line (const char *line + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", line)); } void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h index 8bcd872056b..ccf178af83f 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -31,11 +31,11 @@ public: // ctor // = The Simple_Server methods. - void send_line (const char *line, - CORBA::Environment&) + void send_line (const char *line + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: |