diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index c425e7c6bdb..53f82d338e2 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -23,12 +23,12 @@ Consumer::Consumer (void) int Consumer::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; // Do *NOT* make a copy because we don't want the ORB to outlive @@ -43,43 +43,43 @@ Consumer::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::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier->connect_push_consumer (consumer.in () TAO_ENV_ARG_PARAMETER); + supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for events, using work_pending()/perform_work() may help @@ -104,7 +104,7 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const CORBA::Any & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count_ ++; @@ -117,13 +117,13 @@ Consumer::push (const CORBA::Any & } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** |