diff options
Diffstat (limited to 'TAO/examples/Simulator/Event_Supplier')
8 files changed, 84 insertions, 84 deletions
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 1d687e512e9..a8a39910057 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -72,7 +72,7 @@ DOVE_Supplier::init (void) // Connect to the RootPOA. CORBA::Object_var poaObject_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_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 () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->the_POAManager (ACE_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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -102,7 +102,7 @@ DOVE_Supplier::init (void) this->namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -273,7 +273,7 @@ DOVE_Supplier::notify (CORBA::Any &message) // Now we invoke a RPC this->current_connection_params_->proxyPushConsumer_var_->push (events - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -343,12 +343,12 @@ DOVE_Supplier::get_Scheduler () CORBA::Object_var objref = namingContext_var_->resolve (schedule_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->scheduler_var_ = RtecScheduler::Scheduler::_narrow(objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->resolve (channel_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->eventChannel_var_ = RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in())) @@ -413,7 +413,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> scheduler_var_-> create (this->current_connection_params_->pod_rt_info_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -431,7 +431,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_->pod_rt_info_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->current_connection_params_->pod_rt_info_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -455,17 +455,17 @@ DOVE_Supplier::connect_Supplier () // = Connect as a supplier. this->current_connection_params_->supplierAdmin_var_ = - this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->proxyPushConsumer_var_ = - this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->internal_DOVE_Supplier_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Connect the supplier to the proxy consumer. @@ -473,7 +473,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_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 259919ec604..fc6b9de6843 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -45,9 +45,9 @@ public: int init (void); // Initialize the ORB and the connection to the Name Service - int connect (const char * MIB_name = 0, + int connect (const char * MIB_name = 0, const char* es_name = 0, - const char * ss_name = 0, + const char * ss_name = 0, ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info = 0); // Connect to the event service. @@ -77,7 +77,7 @@ private: public: - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_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 8e753eaf732..6f0f6f22c35 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->terminator_ = terminator_impl_._this (ACE_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_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_lo_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the ECs from the NS. - this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_lo_name_ ACE_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" TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" ACE_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 () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -215,7 +215,7 @@ DualEC_Supplier::init () this->naming_context_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DualEC_Supplier::Terminator::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_hi_ = sched_hi_impl_->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_lo_ = sched_lo_impl_->_this (ACE_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 () TAO_ENV_ARG_PARAMETER); + this->sched_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->sched_lo_name_, - this->sched_lo_.in () TAO_ENV_ARG_PARAMETER); + this->sched_lo_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register high and low priority rt_infos with the @@ -523,7 +523,7 @@ DualEC_Supplier::create_schedulers (void) this->sched_hi_rt_info_hi_ = this->sched_hi_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -541,14 +541,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_hi_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -566,14 +566,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_hi_ = this->sched_lo_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -591,14 +591,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_lo_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -616,7 +616,7 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_hi_ = ec_hi_impl_->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_lo_ = ec_lo_impl_->_this (ACE_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 () TAO_ENV_ARG_PARAMETER); + this->ec_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->channel_lo_name_, - this->ec_lo_.in () TAO_ENV_ARG_PARAMETER); + this->ec_lo_.in () ACE_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 TAO_ENV_ARG_PARAMETER); + infos_out_hi, configs_out_hi, anomalies_out_hi ACE_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 TAO_ENV_ARG_PARAMETER); + infos_out_lo, configs_out_lo, anomalies_out_lo ACE_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 () TAO_ENV_ARG_PARAMETER); + this->anomalies_hi_.out () ACE_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 () TAO_ENV_ARG_PARAMETER); + this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -1153,7 +1153,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 52f1f9c35ee..cb525dc896f 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 (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_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 c279d60d2a4..c0a076e6792 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 TAO_ENV_ARG_PARAMETER); + rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server->set (rt_info_, @@ -81,7 +81,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_admin_->for_consumers (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->obtain_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), dependencies.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -150,7 +150,7 @@ Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Demo_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,18 +177,18 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "ID: " << events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "Name: " << events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; cout << "TCKind: " << kind << endl; - int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER); + int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret) { @@ -196,7 +196,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events 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() TAO_ENV_ARG_PARAMETER)); + ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; if (ret) { Weapons *weapons_ = (Weapons*) events[i].data.any_value.value (); @@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void) { // Disconnect from the push supplier. - this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_->disconnect_push_supplier (ACE_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" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_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 () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -319,7 +319,7 @@ main (int argc, char *argv []) CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -335,11 +335,11 @@ main (int argc, char *argv []) CORBA::Object_var ec_obj = naming_context->resolve (channel_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; delete demo_consumer; root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_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 bf2ace6ab79..0e0d931a3d9 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 9944b1012ff..1d42b0c1598 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -447,7 +447,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 d6582abfbbe..6bf504cefdb 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -493,7 +493,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |