diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Ordering')
8 files changed, 72 insertions, 72 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index dac3fe97703..4be9ad43668 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -23,23 +23,23 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void Notify_Sequence_Push_Consumer::connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_supplier_id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->proxy_supplier_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( - proxysupplier.in () TAO_ENV_ARG_PARAMETER); + proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotification::QoSProperties properties (3); @@ -53,7 +53,7 @@ Notify_Sequence_Push_Consumer::connect ( this->proxy_supplier_->set_qos (properties); this->proxy_supplier_->connect_sequence_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -64,7 +64,7 @@ Notify_Sequence_Push_Consumer::connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( const CosNotification::EventBatch& events - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { static long previous = 0; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h index 5aa672fd73f..0cf74e4e896 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h @@ -31,12 +31,12 @@ public: CORBA::Boolean& done); void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: void push_structured_events (const CosNotification::EventBatch& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); ACE_CString name_; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 363b8add5c6..f074e7de3ec 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -21,23 +21,23 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( - proxysupplier.in () TAO_ENV_ARG_PARAMETER); + proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotification::QoSProperties properties (1); @@ -47,7 +47,7 @@ Notify_Structured_Push_Consumer::connect ( this->proxy_supplier_->set_qos (properties); this->proxy_supplier_->connect_structured_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -58,7 +58,7 @@ Notify_Structured_Push_Consumer::connect ( void Notify_Structured_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { static long previous = 0; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h index 53683eb2ff0..ea1f0685096 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h @@ -31,12 +31,12 @@ public: CORBA::Boolean& done); void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: void push_structured_event (const CosNotification::StructuredEvent& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); ACE_CString name_; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index d699af2910a..261ff0d7728 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -107,13 +107,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); @@ -126,7 +126,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 ()); @@ -136,7 +136,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 consumer Notify_Sequence_Push_Consumer* consumer_1; @@ -148,10 +148,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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; } @@ -166,21 +166,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 ())) @@ -192,16 +192,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 diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index 46581029a0b..31cd6f19d47 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior"; class sig_i : public POA_sig { public: - void go (TAO_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; void -sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { start = 1; @@ -120,13 +120,13 @@ Supplier_Client::parse_args (int argc, char *argv[]) static CosNotifyChannelAdmin::SupplierAdmin_ptr create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::SupplierAdmin_var admin = ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -217,7 +217,7 @@ SendEvents (void) ACE_TRY_NEW_ENV { - supplier_1->send_events (events TAO_ENV_ARG_PARAMETER); + supplier_1->send_events (events ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) @@ -232,17 +232,17 @@ SendEvents (void) static void create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // start up the supplier ACE_NEW_THROW_EX (supplier_1, TAO_Notify_SequencePushSupplier (), CORBA::NO_MEMORY ()); - supplier_1->init (poa TAO_ENV_ARG_PARAMETER); + supplier_1->init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1->connect (admin TAO_ENV_ARG_PARAMETER); + supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -257,29 +257,29 @@ int main (int argc, char* argv[]) ACE_TRY_NEW_ENV { Supplier_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", 0 TAO_ENV_ARG_PARAMETER); + client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNotification::QoSProperties qos (1); qos.length (1); qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy); qos[0].value <<= order_policy; - ec->set_qos (qos TAO_ENV_ARG_PARAMETER); + ec->set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sig_i sig_impl; - sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::String_var ior = - orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -297,10 +297,10 @@ int main (int argc, char* argv[]) } CosNotifyChannelAdmin::SupplierAdmin_var admin = - create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER); + create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); if (!CORBA::is_nil (admin.in ())) { - create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER); + create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; while (!done) 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 diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index f7aa9e3b3a8..f4fcb1b5c93 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior"; class sig_i : public POA_sig { public: - void go (TAO_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; void -sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { start = 1; @@ -121,13 +121,13 @@ Supplier_Client::parse_args (int argc, char *argv[]) static CosNotifyChannelAdmin::SupplierAdmin_ptr create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::SupplierAdmin_var admin = ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -181,7 +181,7 @@ SendEvent (void) ACE_TRY_NEW_ENV { - supplier_1->send_event (event TAO_ENV_ARG_PARAMETER); + supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) @@ -196,17 +196,17 @@ SendEvent (void) static void create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // startup the supplier ACE_NEW_THROW_EX (supplier_1, TAO_Notify_StructuredPushSupplier (), CORBA::NO_MEMORY ()); - supplier_1->init (poa TAO_ENV_ARG_PARAMETER); + supplier_1->init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1->connect (admin TAO_ENV_ARG_PARAMETER); + supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -221,29 +221,29 @@ int main (int argc, char* argv[]) ACE_TRY_NEW_ENV { Supplier_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", 0 TAO_ENV_ARG_PARAMETER); + client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNotification::QoSProperties qos (1); qos.length (1); qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy); qos[0].value <<= order_policy; - ec->set_qos (qos TAO_ENV_ARG_PARAMETER); + ec->set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sig_i sig_impl; - sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::String_var ior = - orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -261,10 +261,10 @@ int main (int argc, char* argv[]) } CosNotifyChannelAdmin::SupplierAdmin_var admin = - create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER); + create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); if (!CORBA::is_nil (admin.in ())) { - create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER); + create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; while (!done) |