diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index d10a2f548c8..9f3631545a0 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -101,13 +101,13 @@ Consumer_Client::parse_args (int argc, char *argv[]) static CosNotifyChannelAdmin::ConsumerAdmin_ptr create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::ConsumerAdmin_var admin = ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP, adminid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -120,7 +120,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); @@ -130,7 +130,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec static void create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, Notify_Test_Client* client - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // startup the first consumer Notify_Structured_Push_Consumer* consumer_1; @@ -140,10 +140,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, expected, client->done ()), CORBA::NO_MEMORY ()); - consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER); + consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1->connect (admin TAO_ENV_ARG_PARAMETER); + consumer_1->connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -158,21 +158,21 @@ int main (int argc, char* argv[]) { Consumer_Client client; - status = client.init (argc, argv TAO_ENV_ARG_PARAMETER); + status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = - client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER); + client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) @@ -184,16 +184,16 @@ int main (int argc, char* argv[]) } CosNotifyChannelAdmin::ConsumerAdmin_var admin = - create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER); + create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { - create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER); + create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Tell the supplier to go - sig->go (TAO_ENV_SINGLE_ARG_PARAMETER); + sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Wait until the supplier is done |