diff options
Diffstat (limited to 'TAO/examples/Simulator')
8 files changed, 124 insertions, 124 deletions
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index afdcab88add..1d687e512e9 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -71,8 +71,8 @@ DOVE_Supplier::init (void) { // Connect to the RootPOA. CORBA::Object_var poaObject_var = - TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -81,18 +81,18 @@ DOVE_Supplier::init (void) -1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (ACE_TRY_ENV); + root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( - "NameService", - ACE_TRY_ENV); + "NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -101,8 +101,8 @@ DOVE_Supplier::init (void) -1); this->namingContext_var_ = - CosNaming::NamingContext::_narrow (namingObj_var.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (namingObj_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -272,8 +272,8 @@ DOVE_Supplier::notify (CORBA::Any &message) events[0] = event; // Now we invoke a RPC - this->current_connection_params_->proxyPushConsumer_var_->push (events, - ACE_TRY_ENV); + this->current_connection_params_->proxyPushConsumer_var_->push (events + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -342,13 +342,13 @@ DOVE_Supplier::get_Scheduler () CORBA::string_dup (this->current_connection_params_->ss_name_); CORBA::Object_var objref = - namingContext_var_->resolve (schedule_name, - ACE_TRY_ENV); + namingContext_var_->resolve (schedule_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->scheduler_var_ = - RtecScheduler::Scheduler::_narrow(objref.in (), - ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow(objref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -378,12 +378,12 @@ DOVE_Supplier::get_EventChannel () CORBA::string_dup (this->current_connection_params_->es_name_); CORBA::Object_var eventServiceObj_var = - this->namingContext_var_->resolve (channel_name, ACE_TRY_ENV); + this->namingContext_var_->resolve (channel_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->eventChannel_var_ = - RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in(), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in() + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in())) @@ -412,8 +412,8 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_->rt_info_ = this->current_connection_params_-> scheduler_var_-> - create (this->current_connection_params_->pod_rt_info_.entry_point, - ACE_TRY_ENV); + create (this->current_connection_params_->pod_rt_info_.entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -430,8 +430,8 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_->pod_rt_info_.quantum, this->current_connection_params_->pod_rt_info_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, - this->current_connection_params_->pod_rt_info_.info_type), - ACE_TRY_ENV); + this->current_connection_params_->pod_rt_info_.info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -455,25 +455,25 @@ DOVE_Supplier::connect_Supplier () // = Connect as a supplier. this->current_connection_params_->supplierAdmin_var_ = - this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_TRY_ENV); + this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->proxyPushConsumer_var_ = - this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_TRY_ENV); + this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // In calling _this we get back an object reference and register // the servant with the POA. RtecEventComm::PushSupplier_var pushSupplier_var = - this->internal_DOVE_Supplier_ptr_->_this (ACE_TRY_ENV); + this->internal_DOVE_Supplier_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Connect the supplier to the proxy consumer. ACE_SupplierQOS_Factory::debug (qos); this->current_connection_params_-> proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 1e65742113d..259919ec604 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -77,7 +77,7 @@ private: public: - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 39a215e7104..4d783849751 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -99,7 +99,7 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv) this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO"); ACE_TRY_CHECK; - this->terminator_ = terminator_impl_._this (ACE_TRY_ENV); + this->terminator_ = terminator_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -151,15 +151,15 @@ DualEC_Supplier::~DualEC_Supplier () this->weapons_Supplier_.disconnect (); // Unbind the schedulers from the NS. - this->naming_context_->unbind (this->sched_hi_name_, ACE_TRY_ENV); + this->naming_context_->unbind (this->sched_hi_name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->sched_lo_name_, ACE_TRY_ENV); + this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the ECs from the NS. - this->naming_context_->unbind (this->channel_hi_name_, ACE_TRY_ENV); + this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->channel_lo_name_, ACE_TRY_ENV); + this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -182,7 +182,7 @@ DualEC_Supplier::init () { // Connect to the RootPOA. CORBA::Object_var poaObject_var = - TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA", ACE_TRY_ENV); + TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -191,21 +191,21 @@ DualEC_Supplier::init () 1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (ACE_TRY_ENV); + root_POA_var_->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; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( - "NameService", - ACE_TRY_ENV); + "NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -214,8 +214,8 @@ DualEC_Supplier::init () -1); this->naming_context_ = - CosNaming::NamingContext::_narrow (namingObj_var.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (namingObj_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -299,7 +299,7 @@ DualEC_Supplier::init () // Private class that implements a termination servant. void -DualEC_Supplier::Terminator::shutdown (CORBA::Environment &) +DualEC_Supplier::Terminator::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); @@ -497,24 +497,24 @@ DualEC_Supplier::create_schedulers (void) ACE_Config_Scheduler, -1); - this->sched_hi_ = sched_hi_impl_->_this (ACE_TRY_ENV); + this->sched_hi_ = sched_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->sched_lo_impl_, ACE_Config_Scheduler, -1); - this->sched_lo_ = sched_lo_impl_->_this (ACE_TRY_ENV); + this->sched_lo_ = sched_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Scheduling Service Implementations with Naming Service this->naming_context_->bind (this ->sched_hi_name_, - this->sched_hi_.in (), ACE_TRY_ENV); + this->sched_hi_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->sched_lo_name_, - this->sched_lo_.in (), ACE_TRY_ENV); + this->sched_lo_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register high and low priority rt_infos with the @@ -522,8 +522,8 @@ DualEC_Supplier::create_schedulers (void) this->sched_hi_rt_info_hi_ = this->sched_hi_-> - create (this->rt_info_dummy_hi_.entry_point, - ACE_TRY_ENV); + create (this->rt_info_dummy_hi_.entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -540,15 +540,15 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.quantum, this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, - this->rt_info_dummy_hi_.info_type), - ACE_TRY_ENV); + this->rt_info_dummy_hi_.info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_hi_-> - create (this->rt_info_dummy_lo_.entry_point, - ACE_TRY_ENV); + create (this->rt_info_dummy_lo_.entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -565,15 +565,15 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.quantum, this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, - this->rt_info_dummy_lo_.info_type), - ACE_TRY_ENV); + this->rt_info_dummy_lo_.info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_hi_ = this->sched_lo_-> - create (this->rt_info_dummy_hi_.entry_point, - ACE_TRY_ENV); + create (this->rt_info_dummy_hi_.entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -590,15 +590,15 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.quantum, this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, - this->rt_info_dummy_hi_.info_type), - ACE_TRY_ENV); + this->rt_info_dummy_hi_.info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_lo_-> - create (this->rt_info_dummy_lo_.entry_point, - ACE_TRY_ENV); + create (this->rt_info_dummy_lo_.entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -615,8 +615,8 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.quantum, this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, - this->rt_info_dummy_lo_.info_type), - ACE_TRY_ENV); + this->rt_info_dummy_lo_.info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -651,7 +651,7 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_hi_ = ec_hi_impl_->_this (ACE_TRY_ENV); + this->ec_hi_ = ec_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->ec_lo_impl_, @@ -661,17 +661,17 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_lo_ = ec_lo_impl_->_this (ACE_TRY_ENV); + this->ec_lo_ = ec_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Event Service Implementations with Naming Service naming_context_->bind (this->channel_hi_name_, - this->ec_hi_.in (), ACE_TRY_ENV); + this->ec_hi_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->channel_lo_name_, - this->ec_lo_.in (), ACE_TRY_ENV); + this->ec_lo_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -711,7 +711,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_hi, configs_out_hi, anomalies_out_hi, ACE_TRY_ENV); + infos_out_hi, configs_out_hi, anomalies_out_hi TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_); @@ -722,7 +722,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_lo, configs_out_lo, anomalies_out_lo, ACE_TRY_ENV); + infos_out_lo, configs_out_lo, anomalies_out_lo TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else /* ! __SUNPRO_CC */ @@ -733,7 +733,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_hi_.out (), this->configs_hi_.out (), - this->anomalies_hi_.out (), ACE_TRY_ENV); + this->anomalies_hi_.out () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sched_lo_->compute_scheduling @@ -742,7 +742,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_lo_.out (), this->configs_lo_.out (), - this->anomalies_lo_.out (), ACE_TRY_ENV); + this->anomalies_lo_.out () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -1152,8 +1152,8 @@ main (int argc, char *argv []) TAO_ORB_Manager orb_Manager; orb_Manager.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 238b386ff03..52f1f9c35ee 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -85,7 +85,7 @@ private: // = DESCRIPTION // Private class that implements a termination servant. { - void shutdown (CORBA::Environment &_env) + void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index b3de9ace56b..d30a3259891 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -59,7 +59,7 @@ int Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, const char *my_name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Get a Scheduler. @@ -68,7 +68,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ACE_Scheduler_Factory::server (); // Define Real-time information. - rt_info_ = server->create (my_name, ACE_TRY_ENV); + rt_info_ = server->create (my_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server->set (rt_info_, @@ -80,8 +80,8 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -100,14 +100,14 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. this->consumer_admin_ = - channel_admin_->for_consumers (ACE_TRY_ENV); + channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain a pointer to a push supplier. "suppliers" is // inherited from a base class. this->suppliers_ = - consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The _this function returns an object pointer. This is needed @@ -115,12 +115,12 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // CORBA::Object. RtecEventComm::PushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), - dependencies.get_ConsumerQOS (), - ACE_TRY_ENV); + dependencies.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) @@ -141,7 +141,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Demo_Consumer::disconnect_push_consumer (CORBA::Environment &) +Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -149,8 +149,8 @@ Demo_Consumer::disconnect_push_consumer (CORBA::Environment &) } void -Demo_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +Demo_Consumer::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,39 +177,39 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events, { // Use a temporary int to avoid overload ambiguities with // the enum. - int kind = events[i].data.any_value.type()->kind (ACE_TRY_ENV); + int kind = events[i].data.any_value.type()->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cout << "ID: " << events[i].data.any_value.type()->id(ACE_TRY_ENV) << endl; + cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "Name: " << events[i].data.any_value.type()->name(ACE_TRY_ENV) << endl; + cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_TRY_ENV) << endl; + cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; cout << "TCKind: " << kind << endl; - int ret = _tc_Navigation->equal (events[i].data.any_value.type(), ACE_TRY_ENV); - ACE_TRY_CHECK; - if (ret) + int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + if (ret) { Navigation *navigation_ = (Navigation*) events[i].data.any_value.value (); cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl; } - else { - ret = (_tc_Weapons->equal (events[i].data.any_value.type(), ACE_TRY_ENV)); - ACE_TRY_CHECK; - if (ret) { - Weapons *weapons_ = (Weapons*) events[i].data.any_value.value (); - cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl; + else { + ret = (_tc_Weapons->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER)); + ACE_TRY_CHECK; + if (ret) { + Weapons *weapons_ = (Weapons*) events[i].data.any_value.value (); + cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl; } - } - } + } + } ACE_CATCHANY { ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n")); } ACE_ENDTRY; - ACE_CHECK; + ACE_CHECK; } } } @@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void) { // Disconnect from the push supplier. - this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV); + this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n")); @@ -286,12 +286,12 @@ main (int argc, char *argv []) // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "internet" 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 ())) @@ -300,16 +300,16 @@ 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; 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; if (CORBA::is_nil (naming_obj.in ())) @@ -318,8 +318,8 @@ main (int argc, char *argv []) 1); 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; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -334,12 +334,12 @@ main (int argc, char *argv []) channel_name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (channel_name, - ACE_TRY_ENV); + naming_context->resolve (channel_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ec.ptr() == 0) @@ -360,19 +360,19 @@ main (int argc, char *argv []) "Someone was feeling introverted.\n"), -1); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; delete demo_consumer; root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index 056fa15c4b3..bf2ace6ab79 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -46,13 +46,13 @@ public: // supplier. Stores <my_name> for printing out messages. Returns 0 // on success, -1 on failure. - 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 channel is disconnecting. // = (not protected to allow short-circuiting) protected: - virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // If the <events>[0] is a notification, prints out the data from // the supplier. If its a shutdown message, the consumer diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index bdb7a13bef2..06b2e4922b8 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -446,8 +446,8 @@ main (int argc, char *argv []) TAO_ORB_Manager orb_Manager; orb_Manager.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 797b1397530..6362c09a17c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -492,8 +492,8 @@ main (int argc, char *argv []) TAO_ORB_Manager orb_Manager; orb_Manager.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |