summaryrefslogtreecommitdiff
path: root/TAO/tests/Object_Loader/Loader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Object_Loader/Loader.cpp')
-rw-r--r--TAO/tests/Object_Loader/Loader.cpp14
1 files changed, 7 insertions, 7 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 ();