diff options
Diffstat (limited to 'TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp')
| -rw-r--r-- | TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index f447dab8b42..127ae92a099 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -24,10 +24,10 @@ class test_i : public POA_test { public: - void deactivate_self (CORBA::Environment &ACE_TRY_ENV) + void deactivate_self (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV); + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); PortableServer::POA_var poa_; @@ -35,17 +35,17 @@ public: }; PortableServer::POA_ptr -test_i::_default_POA (CORBA_Environment & /*ACE_TRY_ENV*/) +test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV) +test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->poa_->deactivate_object (this->id_, - ACE_TRY_ENV); + this->poa_->deactivate_object (this->id_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Exception flag @@ -53,8 +53,8 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - this->poa_->deactivate_object (this->id_, - ACE_TRY_ENV); + this->poa_->deactivate_object (this->id_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -78,8 +78,8 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV) void test_object_deactivation (PortableServer::POA_ptr poa, - const PortableServer::ObjectId &id, - CORBA::Environment &ACE_TRY_ENV) + const PortableServer::ObjectId &id + TAO_ENV_ARG_DECL) { test_i servant; int expected_exception_raised = 0; @@ -89,8 +89,8 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_TRY_EX (invalid_id) { - poa->deactivate_object (invalid_id.in (), - ACE_TRY_ENV); + poa->deactivate_object (invalid_id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (invalid_id); } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -113,12 +113,12 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id, - ACE_TRY_ENV); + poa->deactivate_object (id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Reset flag @@ -126,8 +126,8 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_TRY_EX (double_deactivate) { - poa->deactivate_object (id, - ACE_TRY_ENV); + poa->deactivate_object (id + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (double_deactivate); } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) @@ -148,8 +148,8 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (expected_exception_raised); poa->activate_object_with_id (id, - &servant, - ACE_TRY_ENV); + &servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK; servant.poa_ = @@ -158,10 +158,10 @@ test_object_deactivation (PortableServer::POA_ptr poa, servant.id_ = id; test_var test = - servant._this (ACE_TRY_ENV); + servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - test->deactivate_self (ACE_TRY_ENV); + test->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_ASSERT dissappears in non-debug builds @@ -172,65 +172,65 @@ test_object_deactivation (PortableServer::POA_ptr poa, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList empty_policies; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), - empty_policies, - ACE_TRY_ENV); + empty_policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; obj = - root_poa->create_reference ("IDL:test:1.0", - ACE_TRY_ENV); + root_poa->create_reference ("IDL:test:1.0" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - root_poa->reference_to_id (obj.in (), - ACE_TRY_ENV); + root_poa->reference_to_id (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_object_deactivation (root_poa.in (), - id.in (), - ACE_TRY_ENV); + id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; id = PortableServer::string_to_ObjectId ("good id"); test_object_deactivation (child_poa.in (), - id.in (), - ACE_TRY_ENV); + id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |