diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 79362be04ca..6a2569745fb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -14,24 +14,24 @@ 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; 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; // **************************************************************** @@ -40,11 +40,11 @@ main (int argc, char* argv[]) 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; @@ -52,12 +52,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::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.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -69,15 +69,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -85,15 +85,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier other_supplier; other_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; other_supplier.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -101,15 +101,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier any_source_supplier; any_source_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_source_supplier.connect (supplier_admin.in (), 0, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -117,15 +117,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier any_type_supplier; any_type_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_type_supplier.connect (supplier_admin.in (), event_source, 0, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -133,15 +133,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier wildcard_supplier; wildcard_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; wildcard_supplier.connect (supplier_admin.in (), 0, 0, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -157,8 +157,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -175,8 +175,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, 0, 0); any_type_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -193,8 +193,8 @@ main (int argc, char* argv[]) consumer_qos.insert (0, event_type, 0); any_source_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -211,8 +211,8 @@ main (int argc, char* argv[]) consumer_qos.insert (0, 0, 0); wildcard_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -225,52 +225,52 @@ main (int argc, char* argv[]) // **************************************************************** - wildcard_consumer.disconnect (ACE_TRY_ENV); + wildcard_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_consumer.disconnect (ACE_TRY_ENV); + any_source_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_consumer.disconnect (ACE_TRY_ENV); + any_type_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - regular_consumer.disconnect (ACE_TRY_ENV); + regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.deactivate (ACE_TRY_ENV); + wildcard_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.disconnect (ACE_TRY_ENV); + wildcard_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_supplier.deactivate (ACE_TRY_ENV); + any_type_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.deactivate (ACE_TRY_ENV); + any_source_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.disconnect (ACE_TRY_ENV); + any_source_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.deactivate (ACE_TRY_ENV); + other_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.disconnect (ACE_TRY_ENV); + other_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.deactivate (ACE_TRY_ENV); + supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.disconnect (ACE_TRY_ENV); + supplier.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; // **************************************************************** |