diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 63476ce6f9e..96e0ea64204 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -22,12 +22,12 @@ Supplier::Supplier (void) int Supplier::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc <= 1) @@ -38,43 +38,43 @@ Supplier::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->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; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = CosEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushConsumer_var consumer = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer->connect_push_supplier (supplier.in () TAO_ENV_ARG_PARAMETER); + consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Push the events... @@ -85,28 +85,28 @@ Supplier::run (int argc, char* argv[]) for (int i = 0; i != 2000; ++i) { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (sleep_time); } // Disconnect from the EC - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the EC.... - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate this object... PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA - poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -119,7 +119,7 @@ Supplier::run (int argc, char* argv[]) } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } |