diff options
Diffstat (limited to 'TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp')
| -rw-r--r-- | TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index ecee66581cc..41c06881c76 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -27,10 +27,10 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (TAO_ENV_SINGLE_ARG_DECL) + void method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: PortableServer::POA_var poa_; @@ -44,7 +44,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (TAO_ENV_SINGLE_ARG_DECL) +test_i::method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -62,16 +62,16 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Calling self from %t\n")); - test_var self = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - self->method (TAO_ENV_SINGLE_ARG_PARAMETER); + self->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -96,7 +96,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -118,22 +118,22 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the new POA. @@ -142,12 +142,12 @@ main (int argc, char **argv) policies[0] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the child POA. @@ -155,7 +155,7 @@ main (int argc, char **argv) root_poa->create_POA ("child", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policies @@ -163,20 +163,20 @@ main (int argc, char **argv) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_i servant1 (child_poa.in ()); test_i servant2 (child_poa.in ()); - test_var object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_var object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER); + test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker1 (object1.in ()); @@ -195,7 +195,7 @@ main (int argc, char **argv) root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |