summaryrefslogtreecommitdiff
path: root/TAO/tests/Client_Leaks/Process_Factory.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-12-08 21:59:30 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-12-08 21:59:30 +0000
commitb11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch)
tree6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tests/Client_Leaks/Process_Factory.cpp
parent8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff)
downloadATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tests/Client_Leaks/Process_Factory.cpp')
-rw-r--r--TAO/tests/Client_Leaks/Process_Factory.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index cc58bd7ee74..48bfb96e6d7 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -20,7 +20,7 @@ Process_Factory::shutdown_received (void)
}
Test::Process_ptr
-Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
+Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
{
Startup_Callback *startup_callback_impl;
@@ -32,11 +32,11 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
Test::Startup_Callback_var startup_callback =
- startup_callback_impl->_this (ACE_TRY_ENV);
+ startup_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (Test::Process::_nil ());
CORBA::String_var ior =
- this->orb_->object_to_string (startup_callback.in (), ACE_TRY_ENV);
+ this->orb_->object_to_string (startup_callback.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (Test::Process::_nil ());
const char* argv[3] = {
@@ -68,7 +68,7 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
for (int i = 0; i != 500 && !process_has_started; ++i)
{
ACE_Time_Value interval (0, 10000);
- this->orb_->perform_work (interval, ACE_TRY_ENV);
+ this->orb_->perform_work (interval TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (Test::Process::_nil ());
process_has_started =
@@ -78,12 +78,12 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
ACE_TRY
{
PortableServer::POA_var poa =
- startup_callback_impl->_default_POA (ACE_TRY_ENV);
+ startup_callback_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::ObjectId_var id =
- poa->servant_to_id (startup_callback_impl, ACE_TRY_ENV);
+ poa->servant_to_id (startup_callback_impl TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- poa->deactivate_object (id.in (), ACE_TRY_ENV);
+ poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -104,15 +104,15 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
}
void
-Process_Factory::noop (CORBA::Environment &)
+Process_Factory::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-Process_Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Process_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->shutdown_received_ = 1;
- this->orb_->shutdown (0, ACE_TRY_ENV);
+ this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
}