diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic/Gateway.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Gateway.cpp | 51 |
1 files changed, 19 insertions, 32 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index f98ea924d49..ffe5ab0ee09 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -17,17 +17,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -77,14 +76,13 @@ main (int argc, char* argv[]) TAO_EC_Gateway_IIOP gateway; gateway.init (event_channel_1.in (), - event_channel_2.in () - ACE_ENV_ARG_PARAMETER); + event_channel_2.in ()); RtecEventChannelAdmin::Observer_var obs = gateway._this (); RtecEventChannelAdmin::Observer_Handle h = - event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); + event_channel_2->append_observer (obs.in ()); gateway.observer_handle (h); @@ -97,26 +95,22 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_00; supplier_00.activate (consumer_admin_1.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_00.connect (supplier_admin_1.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin_1.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_01.connect (supplier_admin_1.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** @@ -131,8 +125,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -161,8 +154,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -187,8 +179,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -216,8 +207,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -246,8 +236,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -272,8 +261,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -309,15 +297,14 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } |