diff options
Diffstat (limited to 'TAO/tests/Object_Loader')
| -rw-r--r-- | TAO/tests/Object_Loader/Loader.cpp | 14 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/Loader.h | 4 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/Test_i.cpp | 12 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/Test_i.h | 6 | ||||
| -rw-r--r-- | TAO/tests/Object_Loader/driver.cpp | 24 |
5 files changed, 30 insertions, 30 deletions
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 6937a20cdf1..8c2f2c62553 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -16,25 +16,25 @@ Loader::Loader (void) CORBA::Object_ptr Loader::create_object (CORBA::ORB_ptr orb, int, - char * [], - CORBA::Environment &ACE_TRY_ENV) + char * [] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_i *test; @@ -42,7 +42,7 @@ Loader::create_object (CORBA::ORB_ptr orb, CORBA::Object::_nil ()); PortableServer::ServantBase_var tmp = test; - obj = test->_this (ACE_TRY_ENV); + obj = test->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return obj._retn (); diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index f6675712f20..7dbcbed351d 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -32,8 +32,8 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - char *argv [], - CORBA::Environment &) + char *argv [] + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Create a new instance }; diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp index 5f4ed5a86e1..2bdf3980984 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -18,28 +18,28 @@ Test_i::Test_i (PortableServer::POA_ptr poa) } CORBA::Long -Test_i::instance_count (CORBA::Environment &) +Test_i::instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Test_i::instance_count_; } void -Test_i::destroy (CORBA::Environment &ACE_TRY_ENV) +Test_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in (), ACE_TRY_ENV); + poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -Test_i::_default_POA (CORBA::Environment &) +Test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 06ecfd828b7..4c9a9ad70d3 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -37,13 +37,13 @@ public: Test_i (PortableServer::POA_ptr poa); // ctor - CORBA::Long instance_count (CORBA::Environment &) + CORBA::Long instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA::Environment &) + void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (CORBA::Environment &) + PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index b16afaa9f27..5cf0f232ce8 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -22,20 +22,20 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf, ACE_TRY_ENV); + CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object ("DLL:Test_Object", - ACE_TRY_ENV); + orb->string_to_object ("DLL:Test_Object" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var test = - Test::_narrow (object.in (), ACE_TRY_ENV); + Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Long count = - test->instance_count (ACE_TRY_ENV); + test->instance_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (count != norbs*i + j + 1) @@ -45,7 +45,7 @@ main (int, char *[]) "(%d != %d)\n", count, norbs * i + j + 1)); } - test->destroy (ACE_TRY_ENV); + test->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -57,22 +57,22 @@ main (int, char *[]) int argc = 0; CORBA::ORB_var orb = - CORBA::ORB_init (argc, 0, buf, ACE_TRY_ENV); + CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } |