diff options
Diffstat (limited to 'TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 72f83da7610..bce8e4efbc6 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -12,24 +12,24 @@ 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; 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; // **************************************************************** @@ -38,23 +38,23 @@ main (int argc, char* argv[]) 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; // **************************************************************** // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -63,32 +63,32 @@ main (int argc, char* argv[]) CEC_Counting_Supplier supplier_00; - supplier_00.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_00.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Supplier supplier_01; - supplier_01.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_01.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Supplier supplier_10; - supplier_10.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_10.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Supplier supplier_11; - supplier_11.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_11.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -96,22 +96,22 @@ main (int argc, char* argv[]) // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... CEC_Counting_Consumer consumer_00 ("Consumer/00"); - consumer_00.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_00.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01"); - consumer_01.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_01.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10"); - consumer_10.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_10.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -171,35 +171,35 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_10.disconnect (ACE_TRY_ENV); + consumer_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_01.disconnect (ACE_TRY_ENV); + consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.disconnect (ACE_TRY_ENV); + supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.disconnect (ACE_TRY_ENV); + supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (ACE_TRY_ENV); + supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (ACE_TRY_ENV); + supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** |