diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/data.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/data.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 89a008bf0b0..9582037ebd3 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -39,7 +39,7 @@ Data::Data (CORBA::ORB_var orb) m_any1 (CORBA::_tc_long), orb_ (orb) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -62,8 +62,8 @@ Data::Data (CORBA::ORB_var orb) // Getting the RootPOA so we can generate object references. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -75,28 +75,28 @@ Data::Data (CORBA::ORB_var orb) // 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; // Generate values for the member variables. this->m_objref1 = - root_poa->create_reference ("foo", - ACE_TRY_ENV); + root_poa->create_reference ("foo" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->m_objref2 = - root_poa->create_reference ("foo", - ACE_TRY_ENV); + root_poa->create_reference ("foo" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Clean up after the POA root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } |