diff options
Diffstat (limited to 'TAO/orbsvcs/tests/CosEvent/lib')
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp | 36 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp | 35 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h | 12 |
4 files changed, 36 insertions, 59 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index 86e762bea0a..45e51852cd8 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -13,8 +13,7 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name) } void -CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) { // The canonical protocol to connect to the EC @@ -27,8 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer consumer_admin->obtain_push_supplier (); } - this->supplier_proxy_->connect_push_consumer (consumer.in () - ACE_ENV_ARG_PARAMETER); + this->supplier_proxy_->connect_push_consumer (consumer.in ()); } void @@ -42,8 +40,8 @@ CEC_Counting_Consumer::disconnect (void) PortableServer::POA_var consumer_poa = this->_default_POA (); PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this); + consumer_poa->deactivate_object (consumer_id.in ()); this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil (); @@ -70,8 +68,7 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -CEC_Counting_Consumer::push (const CORBA::Any& - ACE_ENV_ARG_DECL_NOT_USED) +CEC_Counting_Consumer::push (const CORBA::Any&) ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count ++; @@ -105,8 +102,7 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name) } void -CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) { // The canonical protocol to connect to the EC @@ -119,8 +115,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con consumer_admin->obtain_pull_supplier (); } - this->supplier_proxy_->connect_pull_consumer (consumer.in () - ACE_ENV_ARG_PARAMETER); + this->supplier_proxy_->connect_pull_consumer (consumer.in ()); } void @@ -134,8 +129,8 @@ CEC_Pull_Counting_Consumer::disconnect (void) PortableServer::POA_var consumer_poa = this->_default_POA (); PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this); + consumer_poa->deactivate_object (consumer_id.in ()); this->supplier_proxy_ = CosEventChannelAdmin::ProxyPullSupplier::_nil (); @@ -153,8 +148,7 @@ CEC_Pull_Counting_Consumer::pull (void) } CORBA::Any* -CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event - ACE_ENV_ARG_DECL) +CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event) { if (CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -163,7 +157,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event } CORBA::Any_var event = - this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER); + this->supplier_proxy_->try_pull (has_event); if (has_event) this->event_count++; @@ -215,15 +209,14 @@ CEC_Counting_Consumer_Task:: int CEC_Counting_Consumer_Task::svc () { - ACE_TRY_NEW_ENV + try { this->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } @@ -250,8 +243,7 @@ CEC_Counting_Consumer_Task::run (void) do { CORBA::Boolean has_event; CORBA::Any_var event = - this->consumer_->try_pull (has_event - ACE_ENV_ARG_PARAMETER); + this->consumer_->try_pull (has_event); if (this->milliseconds_ != 0) { diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index fc5473649c5..7b30ad07f53 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -39,8 +39,7 @@ public: CEC_Counting_Consumer (const char* name); // Constructor - void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL); + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); void disconnect (void); // Simple connect/disconnect methods.. @@ -50,8 +49,7 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any& events - ACE_ENV_ARG_DECL) + virtual void push (const CORBA::Any& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -85,8 +83,7 @@ public: CEC_Pull_Counting_Consumer (const char* name); // Constructor - void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL); + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); void disconnect (void); // Simple connect/disconnect methods.. @@ -95,8 +92,7 @@ public: // expected count. CORBA::Any *pull (void); - CORBA::Any *try_pull (CORBA::Boolean_out has_event - ACE_ENV_ARG_DECL); + CORBA::Any *try_pull (CORBA::Boolean_out has_event); // = The CosEventComm::PullConsumer methods virtual void disconnect_pull_consumer (void) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index 5c26a242646..2ac8fb804a5 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -13,8 +13,7 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void) void CEC_Counting_Supplier::connect ( - CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL) + CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin) { CosEventComm::PushSupplier_var supplier = this->_this (); @@ -25,8 +24,7 @@ CEC_Counting_Supplier::connect ( supplier_admin->obtain_push_consumer (); } - this->consumer_proxy_->connect_push_supplier (supplier.in () - ACE_ENV_ARG_PARAMETER); + this->consumer_proxy_->connect_push_supplier (supplier.in ()); } void @@ -40,16 +38,15 @@ CEC_Counting_Supplier::disconnect (void) PortableServer::POA_var supplier_poa = this->_default_POA (); PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this); + supplier_poa->deactivate_object (supplier_id.in ()); this->consumer_proxy_ = CosEventChannelAdmin::ProxyPushConsumer::_nil (); } void -CEC_Counting_Supplier::push (const CORBA::Any& - ACE_ENV_ARG_DECL) +CEC_Counting_Supplier::push (const CORBA::Any&) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -58,7 +55,7 @@ CEC_Counting_Supplier::push (const CORBA::Any& CORBA::Any event; event <<= CORBA::Long(0); - this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event); this->event_count++; } @@ -86,15 +83,14 @@ CEC_Counting_Supplier_Task:: int CEC_Counting_Supplier_Task::svc () { - ACE_TRY_NEW_ENV + try { this->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } @@ -119,7 +115,7 @@ CEC_Counting_Supplier_Task::run (void) int stop = 0; do { - this->supplier_->push (event ACE_ENV_ARG_PARAMETER); + this->supplier_->push (event); if (this->milliseconds_ != 0) { @@ -150,8 +146,7 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void) void CEC_Pull_Counting_Supplier::connect ( - CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL) + CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin) { CosEventComm::PullSupplier_var supplier = this->_this (); @@ -162,8 +157,7 @@ CEC_Pull_Counting_Supplier::connect ( supplier_admin->obtain_pull_consumer (); } - this->consumer_proxy_->connect_pull_supplier (supplier.in () - ACE_ENV_ARG_PARAMETER); + this->consumer_proxy_->connect_pull_supplier (supplier.in ()); } void @@ -177,8 +171,8 @@ CEC_Pull_Counting_Supplier::disconnect (void) PortableServer::POA_var supplier_poa = this->_default_POA (); PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this); + supplier_poa->deactivate_object (supplier_id.in ()); this->consumer_proxy_ = CosEventChannelAdmin::ProxyPullConsumer::_nil (); @@ -205,8 +199,7 @@ CEC_Pull_Counting_Supplier::pull (void) } CORBA::Any* -CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event - ACE_ENV_ARG_DECL) +CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 0fa909e7315..b8505bdb9c8 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -41,13 +41,11 @@ public: // = The CosEventComm::PushSupplier methods - void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL); + void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); void disconnect (void); // Simple connect/disconnect methods.. - void push (const CORBA::Any& events - ACE_ENV_ARG_DECL) + void push (const CORBA::Any& events) ACE_THROW_SPEC ((CORBA::SystemException)); // Push an event. @@ -115,16 +113,14 @@ public: // = The CosEventComm::PullSupplier methods - void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL); + void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); void disconnect (void); // Simple connect/disconnect methods.. // The PullSupplier methods. CORBA::Any* pull (void) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - CORBA::Any* try_pull (CORBA::Boolean_out has_event - ACE_ENV_ARG_DECL) + CORBA::Any* try_pull (CORBA::Boolean_out has_event) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); virtual void disconnect_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); |