diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index e5af9ddc13c..3ec8bfb2ba9 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -83,17 +83,17 @@ static void create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CosNotifyChannelAdmin::EventChannel_ptr ec, Notify_Test_Client* client - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Notify_Push_Consumer* consumer = 0; ACE_NEW_THROW_EX (consumer, Notify_Push_Consumer ("Consumer"), CORBA::NO_MEMORY ()); - consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER); + consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer->connect (admin, ec, isFilter TAO_ENV_ARG_PARAMETER); + consumer->connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -109,7 +109,7 @@ 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) @@ -117,7 +117,7 @@ int main (int argc, char * argv[]) CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("NotifyEventChannelFactory", 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CosNotifyChannelAdmin::AdminID adminid = 0; @@ -125,7 +125,7 @@ int main (int argc, char * argv[]) ec->new_for_consumers ((op ? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP), adminid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -134,11 +134,11 @@ int main (int argc, char * argv[]) if (isFilter) { CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNotifyFilter::Filter_var filter = - ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER); + ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (filter.in ())) @@ -154,7 +154,7 @@ int main (int argc, char * argv[]) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup ("Number == 50"); - filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); + filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // apply filter @@ -171,7 +171,7 @@ int main (int argc, char * argv[]) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - consumer_admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + consumer_admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // End Filter Section @@ -183,7 +183,7 @@ int main (int argc, char * argv[]) CosNaming::NamingContext_ptr naming_context = client.naming_context (); CORBA::Object_var ctrl_obj = naming_context->resolve (ctrl_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ctrl_obj.in ())) @@ -202,7 +202,7 @@ int main (int argc, char * argv[]) create_consumers (consumer_admin.in (), ec.in (), &client - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Start Supplier |