diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Notify')
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Filter/Filter.cpp | 136 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Filter/Filter.h | 42 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Filter/main.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp | 126 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h | 42 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/main.cpp | 4 |
6 files changed, 177 insertions, 177 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index cc5a8a9014e..d0af444ec99 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -28,37 +28,37 @@ FilterClient::~FilterClient () } void -FilterClient::init (int argc, char *argv [] TAO_ENV_ARG_DECL) +FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { - init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); + init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); + create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::run (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::run (ACE_ENV_SINGLE_ARG_DECL) { - send_events (TAO_ENV_SINGLE_ARG_PARAMETER); + send_events (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE) @@ -78,17 +78,17 @@ FilterClient::done (void) void FilterClient::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -99,23 +99,23 @@ FilterClient::init_ORB (int argc, } this->root_poa_ = PortableServer::POA::_narrow (poa_object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -123,12 +123,12 @@ FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -136,47 +136,47 @@ FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_EC (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var sa_filter = - ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); + ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (sa_filter.in ())); @@ -187,31 +187,31 @@ FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER); - sa_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); + sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_admin_->add_filter (sa_filter.in () TAO_ENV_ARG_PARAMETER); + supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) +FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var ca_filter = - ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); + ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ca_filter.in ())); @@ -227,10 +227,10 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER); - ca_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); + ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_admin_->add_filter (ca_filter.in () TAO_ENV_ARG_PARAMETER); + consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the CA to receive all type of events @@ -242,19 +242,19 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL) { // startup the first consumer. ACE_NEW_THROW_EX (consumer_1, Filter_StructuredPushConsumer (this, "consumer1"), CORBA::NO_MEMORY ()); - consumer_1->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); + consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second consumer. @@ -262,19 +262,19 @@ FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL) Filter_StructuredPushConsumer (this, "consumer2"), CORBA::NO_MEMORY ()); - consumer_2->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); + consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) { // startup the first supplier ACE_NEW_THROW_EX (supplier_1, Filter_StructuredPushSupplier ("supplier1"), CORBA::NO_MEMORY ()); - supplier_1->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); + supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second supplier @@ -282,12 +282,12 @@ FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) Filter_StructuredPushSupplier ("supplier2"), CORBA::NO_MEMORY ()); - supplier_2->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); + supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL) { // operations: CosNotification::StructuredEvent event; @@ -332,10 +332,10 @@ FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL) // any event.remainder_of_body <<= (CORBA::Long)i; - supplier_1->send_event (event TAO_ENV_ARG_PARAMETER); + supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_2->send_event (event TAO_ENV_ARG_PARAMETER); + supplier_2->send_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -352,15 +352,15 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void) } void -Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) +Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ 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); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -368,21 +368,21 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); + _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); + disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -390,7 +390,7 @@ void Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -402,7 +402,7 @@ Filter_StructuredPushConsumer::offer_change void Filter_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -428,7 +428,7 @@ Filter_StructuredPushConsumer::push_structured_event void Filter_StructuredPushConsumer::disconnect_structured_push_consumer - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -449,43 +449,43 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier () } void -Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) +Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } void Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -496,20 +496,20 @@ Filter_StructuredPushSupplier::subscription_change void Filter_StructuredPushSupplier::send_event - (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL) + (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); ACE_DEBUG ((LM_DEBUG, "%s is sending an event \n", my_name_.fast_rep ())); - proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); + proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Filter_StructuredPushSupplier::disconnect_structured_push_supplier - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 6054e2bd1ab..c916d858315 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -46,41 +46,41 @@ class FilterClient ~FilterClient (); // Destructor - void init (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Consumer calls done, We're done. protected: - void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (TAO_ENV_SINGLE_ARG_DECL); + void create_EC (ACE_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (TAO_ENV_SINGLE_ARG_DECL); + void create_consumers (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (TAO_ENV_SINGLE_ARG_DECL); + void send_events (ACE_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -145,11 +145,11 @@ class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushCo Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. protected: @@ -175,7 +175,7 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -185,7 +185,7 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -193,7 +193,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -216,15 +216,15 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu // Constructor. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. protected: @@ -246,7 +246,7 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -255,7 +255,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 3957d8425e5..845f7ab68f7 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -11,10 +11,10 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { client.init (argc, argv - TAO_ENV_ARG_PARAMETER); //Init the Client + ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 13af016f3b7..495f573cd08 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -30,30 +30,30 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL) +Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { - init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); + init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); + create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::run (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::run (ACE_ENV_SINGLE_ARG_DECL) { - this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); + this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb. @@ -73,17 +73,17 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -117,12 +117,12 @@ Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -130,83 +130,83 @@ Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) +Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL) { consumer_1_ = new Subscribe_StructuredPushConsumer (this); consumer_1_->connect (this->consumer_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_2_ = new Subscribe_StructuredPushConsumer (this); consumer_2_->connect (this->consumer_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) { supplier_1_ = new Subscribe_StructuredPushSupplier (); supplier_1_->connect (this->supplier_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; supplier_2_ = new Subscribe_StructuredPushSupplier (); supplier_2_->connect (this->supplier_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -220,7 +220,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed[0].domain_name = CORBA::string_dup ("*"); removed[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b" @@ -233,7 +233,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed_1.length (0); this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c" @@ -246,7 +246,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed_2.length (0); this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the events - one of each type @@ -286,11 +286,11 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) // let supplier 1 send all these events for (int i = 0; i < 1; ++i) { - supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -308,15 +308,15 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer () void Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ 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); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -324,21 +324,21 @@ Subscribe_StructuredPushConsumer::connect // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); + _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); + disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -346,7 +346,7 @@ void Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -358,7 +358,7 @@ Subscribe_StructuredPushConsumer::offer_change void Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -379,7 +379,7 @@ Subscribe_StructuredPushConsumer::push_structured_event void Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -406,43 +406,43 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier () void Subscribe_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } void Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -454,17 +454,17 @@ Subscribe_StructuredPushSupplier::subscription_change void Subscribe_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); + proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 37124da02eb..578151b170e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -42,41 +42,41 @@ class Subscribe Subscribe (void); ~Subscribe (); - void init (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Called when all events we are waiting for have occured. protected: - void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (TAO_ENV_SINGLE_ARG_DECL); + void create_EC (ACE_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (TAO_ENV_SINGLE_ARG_DECL); + void create_consumers (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (TAO_ENV_SINGLE_ARG_DECL); + void send_events (ACE_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -135,11 +135,11 @@ class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPus Subscribe_StructuredPushConsumer (Subscribe* subscribe); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); @@ -164,7 +164,7 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -174,7 +174,7 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -182,7 +182,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -205,15 +205,15 @@ class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPus // Constructor. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. protected: @@ -232,7 +232,7 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -241,7 +241,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index e7e5550a01e..b817728c231 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -11,10 +11,10 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { client.init (argc, argv - TAO_ENV_ARG_PARAMETER); //Init the Client + ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) |